shaka-player 3.3.2 → 4.0.0

package/test/text/vtt_text_parser_unit.js

@@ -4,15 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.log');
-goog.require('shaka.test.Util');
-goog.require('shaka.text.Cue');
-goog.require('shaka.text.CueRegion');
-goog.require('shaka.text.VttTextParser');
-goog.require('shaka.util.BufferUtils');
-goog.require('shaka.util.Error');
-goog.require('shaka.util.StringUtils');
-
 describe('VttTextParser', () => {
   const Cue = shaka.text.Cue;
   const CueRegion = shaka.text.CueRegion;
@@ -34,13 +25,13 @@ describe('VttTextParser', () => {
   it('supports no cues', () => {
     verifyHelper([],
         'WEBVTT',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
   it('supports initial comments', () => {
     verifyHelper([],
         'WEBVTT - Comments',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
   it('supports comment blocks', () => {
@@ -48,7 +39,7 @@ describe('VttTextParser', () => {
         'WEBVTT\n\n' +
         'NOTE\n' +
         'This is a comment block',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
   it('supports comment blocks with inital comment', () => {
@@ -56,7 +47,7 @@ describe('VttTextParser', () => {
         'WEBVTT\n\n' +
         'NOTE - A header comment\n' +
         'This is a comment block',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
   it('handles a blank line at the end of the file', () => {
@@ -67,7 +58,7 @@ describe('VttTextParser', () => {
         'WEBVTT\n\n' +
         '00:00:20.000 --> 00:00:40.000\n' +
         'Test\n\n',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
   it('handles no blank line at the end of the file', () => {
@@ -78,8 +69,7 @@ describe('VttTextParser', () => {
         'WEBVTT\n\n' +
         '00:00:20.000 --> 00:00:40.000\n' +
         'Test\n',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0,
-        });
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
   it('handles no newline after the final text payload', () => {
@@ -90,7 +80,7 @@ describe('VttTextParser', () => {
         'WEBVTT\n\n' +
         '00:00:20.000 --> 00:00:40.000\n' +
         'Test',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
   it('supports cues with no settings', () => {
@@ -106,7 +96,7 @@ describe('VttTextParser', () => {
         '2\n' +
         '00:00:40.000 --> 00:00:50.000\n' +
         'Test2',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
   it('supports cues with no ID', () => {
@@ -120,7 +110,7 @@ describe('VttTextParser', () => {
         'Test\n\n' +
         '00:00:40.000 --> 00:00:50.000\n' +
         'Test2',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
   it('supports comments within cues', () => {
@@ -136,7 +126,7 @@ describe('VttTextParser', () => {
         'This is a note\n\n' +
         '00:00:40.000 --> 00:00:50.000\n' +
         'Test2',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
   it('supports non-integer timecodes', () => {
@@ -147,7 +137,7 @@ describe('VttTextParser', () => {
         'WEBVTT\n\n' +
         '00:00:20.100 --> 00:00:40.505\n' +
         'Test',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
   it('supports large timecodes', () => {
@@ -158,50 +148,50 @@ describe('VttTextParser', () => {
         'WEBVTT\n\n' +
         '00:00:20.000 --> 30:00:00.000\n' +
         'Test',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
   it('requires header', () => {
     errorHelper(shaka.util.Error.Code.INVALID_TEXT_HEADER,
         '',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
     errorHelper(shaka.util.Error.Code.INVALID_TEXT_HEADER,
         '00:00:00.000 --> 00:00:00.020\nTest',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
   it('rejects invalid time values', () => {
     errorHelper(shaka.util.Error.Code.INVALID_TEXT_CUE,
         'WEBVTT\n\n00.020    --> 0:00.040\nTest',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0},
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0},
         anyString);
     errorHelper(shaka.util.Error.Code.INVALID_TEXT_CUE,
         'WEBVTT\n\n0:00.020  --> 0:00.040\nTest',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0},
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0},
         anyString);
     errorHelper(shaka.util.Error.Code.INVALID_TEXT_CUE,
         'WEBVTT\n\n00:00.20  --> 0:00.040\nTest',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0},
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0},
         anyString);
     errorHelper(shaka.util.Error.Code.INVALID_TEXT_CUE,
         'WEBVTT\n\n00:100.20 --> 0:00.040\nTest',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0},
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0},
         anyString);
     errorHelper(shaka.util.Error.Code.INVALID_TEXT_CUE,
         'WEBVTT\n\n00:00.020 --> 0:00.040\nTest',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0},
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0},
         anyString);
     errorHelper(shaka.util.Error.Code.INVALID_TEXT_CUE,
         'WEBVTT\n\n00:00:00:00.020 --> 0:00.040\nTest',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0},
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0},
         anyString);
     errorHelper(shaka.util.Error.Code.INVALID_TEXT_CUE,
         'WEBVTT\n\n00:61.020 --> 0:00.040\nTest',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0},
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0},
         anyString);
     errorHelper(shaka.util.Error.Code.INVALID_TEXT_CUE,
         'WEBVTT\n\n61:00.020 --> 0:00.040\nTest',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0},
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0},
         anyString);
   });
 
@@ -226,7 +216,7 @@ describe('VttTextParser', () => {
         'Test\n\n' +
         '00:00:40.000 --> 00:00:50.000 vertical:lr\n' +
         'Test2',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
   it('supports line setting', () => {
@@ -258,7 +248,7 @@ describe('VttTextParser', () => {
         'Test3\n\n' +
         '00:00:55.000 --> 00:01:05.000 line:12.3%\n' +
         'Test4\n\n',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
   it('supports line setting with optional part', () => {
@@ -280,7 +270,7 @@ describe('VttTextParser', () => {
         'Test\n\n' +
         '00:00:40.000 --> 00:00:50.000 line:-1,center\n' +
         'Test2',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
   it('supports position setting', () => {
@@ -294,7 +284,7 @@ describe('VttTextParser', () => {
         'Test\n\n' +
         '00:00:25.000 --> 00:00:45.000 position:12.3%\n' +
         'Test2\n\n',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
   it('supports position setting with optional part', () => {
@@ -314,7 +304,7 @@ describe('VttTextParser', () => {
         'Test\n\n' +
         '00:00:20.000 --> 00:00:40.000 position:45%,start\n' +
         'Test2',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
   it('supports size setting', () => {
@@ -328,7 +318,7 @@ describe('VttTextParser', () => {
         'Test\n\n' +
         '00:00:25.000 --> 00:00:45.000 size:12.3%\n' +
         'Test2\n\n',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
   it('supports align setting', () => {
@@ -339,7 +329,7 @@ describe('VttTextParser', () => {
         'WEBVTT\n\n' +
         '00:00:20.000 --> 00:00:40.000 align:center\n' +
         'Test',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
   it('supports multiple settings', () => {
@@ -357,7 +347,7 @@ describe('VttTextParser', () => {
         'WEBVTT\n\n' +
         '00:00:20.000 --> 00:00:40.000 align:center size:56% vertical:lr\n' +
         'Test',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
   it('supports timestamps with one-digit hour at start time', () => {
@@ -375,7 +365,7 @@ describe('VttTextParser', () => {
         'WEBVTT\n\n' +
         '0:00:20.000 --> 00:00:40.000 align:center size:56% vertical:lr\n' +
         'Test',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
   it('supports timestamps with one-digit hour at end time', () => {
@@ -393,7 +383,7 @@ describe('VttTextParser', () => {
         'WEBVTT\n\n' +
         '00:00:20.000 --> 0:00:40.000 align:center size:56% vertical:lr\n' +
         'Test',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
   it('supports stamps with one-digit hours at start & end time', () => {
@@ -411,15 +401,15 @@ describe('VttTextParser', () => {
         'WEBVTT\n\n' +
         '0:00:20.000 --> 0:00:40.000 align:center size:56% vertical:lr\n' +
         'Test',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
-  it('uses time offset from periodStart, not segmentStart', () => {
+  it('uses time offset from vttOffset, not periodStart or segmentStart', () => {
     verifyHelper(
         [
           {
-            startTime: 70,
-            endTime: 80,
+            startTime: 50,
+            endTime: 60,
             payload: 'Test',
             textAlign: 'center',
             size: 56,
@@ -429,10 +419,9 @@ describe('VttTextParser', () => {
         'WEBVTT\n\n' +
         '0:00:10.000 --> 0:00:20.000 align:center size:56% vertical:lr\n' +
         'Test',
-        {periodStart: 60, segmentStart: 80, segmentEnd: 100});
+        {periodStart: 60, segmentStart: 80, segmentEnd: 100, vttOffset: 40});
   });
 
-
   it('parses VTTRegions', () => {
     verifyHelper(
         [
@@ -460,7 +449,7 @@ describe('VttTextParser', () => {
         'viewportanchor=10%,90% scroll=up\n\n' +
         '0:00:20.000 --> 0:00:40.000 region:reg1\n' +
         'Test',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
   it('ignores and logs invalid settings', () => {
@@ -473,7 +462,7 @@ describe('VttTextParser', () => {
         'WEBVTT\n\n' +
         '00:00:20.000 --> 00:00:40.000 vertical:es\n' +
         'Test\n\n',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
 
     verifyHelper(
         [
@@ -482,7 +471,7 @@ describe('VttTextParser', () => {
         'WEBVTT\n\n' +
         '00:00:20.000 --> 00:00:40.000 vertical:\n' +
         'Test\n\n',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
 
     verifyHelper(
         [
@@ -491,7 +480,7 @@ describe('VttTextParser', () => {
         'WEBVTT\n\n' +
         '00:00:20.000 --> 00:00:40.000 vertical\n' +
         'Test\n\n',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
 
     verifyHelper(
         [
@@ -500,7 +489,7 @@ describe('VttTextParser', () => {
         'WEBVTT\n\n' +
         '00:00:20.000 --> 00:00:40.000 line:-3%\n' +
         'Test\n\n',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
 
     verifyHelper(
         [
@@ -509,7 +498,7 @@ describe('VttTextParser', () => {
         'WEBVTT\n\n' +
         '00:00:20.000 --> 00:00:40.000 line:45%%\n' +
         'Test\n\n',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
 
     verifyHelper(
         [
@@ -518,7 +507,7 @@ describe('VttTextParser', () => {
         'WEBVTT\n\n' +
         '00:00:20.000 --> 00:00:40.000 align:10\n' +
         'Test\n\n',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
 
     verifyHelper(
         [
@@ -527,7 +516,7 @@ describe('VttTextParser', () => {
         'WEBVTT\n\n' +
         '00:00:20.000 --> 00:00:40.000 align:foo\n' +
         'Test\n\n',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
 
     expect(logWarningSpy).toHaveBeenCalledTimes(7);
   });
@@ -546,7 +535,7 @@ describe('VttTextParser', () => {
         'Test\n\n' +
         '00:00:40.000 --> 00:00:50.000 line:-1\n' +
         'Test2',
-        {periodStart: 0, segmentStart: 25, segmentEnd: 65});
+        {periodStart: 0, segmentStart: 25, segmentEnd: 65, vttOffset: 0});
   });
 
   it('handles timestamp rollover with X-TIMESTAMP-MAP header', () => {
@@ -562,7 +551,7 @@ describe('VttTextParser', () => {
         'Test',
         // Non-null segmentStart takes precedence over X-TIMESTAMP-MAP.
         // This protects us from rollover in the MPEGTS field.
-        {periodStart: 0, segmentStart: 95440, segmentEnd: 95550});
+        {periodStart: 0, segmentStart: 95440, segmentEnd: 95550, vttOffset: 0});
 
     verifyHelper(
         [
@@ -575,7 +564,7 @@ describe('VttTextParser', () => {
         'X-TIMESTAMP-MAP=MPEGTS:9745408,LOCAL:00:00:00.000\n\n' +
         '00:00:00.000 --> 00:00:02.000 line:0\n' +
         'Test2',
-        {periodStart: 0, segmentStart: 95550, segmentEnd: 95560});
+        {periodStart: 0, segmentStart: 95550, segmentEnd: 95560, vttOffset: 0});
   });
 
   it('supports global style blocks', () => {
@@ -606,7 +595,7 @@ describe('VttTextParser', () => {
         'Test\n\n' +
         '00:00:40.000 --> 00:00:50.000\n' +
         'Test2',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
   it('supports global style blocks without blank lines', () => {
@@ -634,7 +623,7 @@ describe('VttTextParser', () => {
         'Test\n\n' +
         '00:00:40.000 --> 00:00:50.000\n' +
         'Test2',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
   it('supports payload stylized', () => {
@@ -775,7 +764,7 @@ describe('VttTextParser', () => {
         '<b>Test <i>7</i></b>\n\n' +
         '00:01:30.000 --> 00:01:40.000\n' +
         '<b>Test<i>8</b>',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
   it('supports specific style blocks', () => {
@@ -803,7 +792,7 @@ describe('VttTextParser', () => {
         '<b>Test</b>\n\n' +
         '00:00:40.000 --> 00:00:50.000\n' +
         'Test2',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
   it('supports only two digits in the timestamp', () => {
@@ -814,7 +803,7 @@ describe('VttTextParser', () => {
         'WEBVTT\n\n' +
         '00:00:20.00 --> 00:00:40.00\n' +
         'Test',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
   it('supports class with default color', () => {
@@ -956,7 +945,7 @@ describe('VttTextParser', () => {
         '<c.lime>forward slash 1/2 in text</c>\n\n' +
         '00:01:50.000 --> 00:02:00.000\n' +
         '<c.lime>less or more < > in text</c>',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
   it('supports default color overriding', () => {
@@ -982,7 +971,7 @@ describe('VttTextParser', () => {
         '::cue(bg_blue) { font-size: 10px; background-color: #FF0 }\n\n' +
         '00:00:10.000 --> 00:00:20.000\n' +
         '<c.red.bg_blue>Example 1</c>\n\n',
-        {periodStart: 0, segmentStart: 0, segmentEnd: 0});
+        {periodStart: 0, segmentStart: 0, segmentEnd: 0, vttOffset: 0});
   });
 
   /**

package/test/text/web_vtt_generator_unit.js

@@ -4,9 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.text.Cue');
-goog.require('shaka.text.WebVttGenerator');
-
 describe('WebVttGenerator', () => {
   it('supports no cues', () => {
     verifyHelper([], [], 'WEBVTT\n\n');

package/test/ui/ad_ui_unit.js

@@ -4,17 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.Player');
-goog.require('shaka.ads.AdManager');
-goog.require('shaka.test.FakeAd');
-goog.require('shaka.test.FakeAdManager');
-goog.require('shaka.test.UiUtils');
-goog.require('shaka.test.Util');
-goog.require('shaka.test.Waiter');
-goog.require('shaka.ui.Locales');
-goog.require('shaka.util.EventManager');
-goog.requireType('shaka.ui.Localization');
-
 describe('Ad UI', () => {
   const UiUtils = shaka.test.UiUtils;
   /** @type {!HTMLLinkElement} */

package/test/ui/localization_unit.js

@@ -4,9 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.ui.Localization');
-goog.requireType('shaka.util.FakeEvent');
-
 describe('Localization', () => {
   const Localization = shaka.ui.Localization;
 

package/test/ui/text_displayer_layout_unit.js

@@ -4,17 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.Player');
-goog.require('shaka.test.FakeVideo');
-goog.require('shaka.test.UiUtils');
-goog.require('shaka.test.Util');
-goog.require('shaka.test.Waiter');
-goog.require('shaka.text.Cue');
-goog.require('shaka.text.SimpleTextDisplayer');
-goog.require('shaka.text.UITextDisplayer');
-goog.require('shaka.ui.Overlay');
-goog.require('shaka.util.EventManager');
-
 // TODO: Move this suite to the text/ folder where it belongs
 const supportsScreenshots = () => shaka.test.Util.supportsScreenshots();
 filterDescribe('TextDisplayer layout', supportsScreenshots, () => {
@@ -416,7 +405,7 @@ filterDescribe('TextDisplayer layout', supportsScreenshots, () => {
       await checkScreenshot(prefix, 'flat-cue-bg');
     });
 
-    // https://github.com/google/shaka-player/issues/2761
+    // https://github.com/shaka-project/shaka-player/issues/2761
     it('deeply-nested cues', async () => {
       const makeCue = (text, fg = '', bg = '', nestedCues = []) => {
         const cue = new shaka.text.Cue(0, 1, text);

package/test/ui/ui_customization_unit.js

@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('goog.asserts');
-goog.require('shaka.test.UiUtils');
-goog.require('shaka.test.Waiter');
-goog.require('shaka.util.EventManager');
-goog.requireType('shaka.ui.Overlay');
-
 describe('UI Customization', () => {
   const UiUtils = shaka.test.UiUtils;
   /** @type {!HTMLLinkElement} */

package/test/ui/ui_integration.js

@@ -4,22 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('goog.asserts');
-goog.require('mozilla.LanguageMapping');
-goog.require('shaka.test.Loader');
-goog.require('shaka.test.TestScheme');
-goog.require('shaka.test.UiUtils');
-goog.require('shaka.test.Util');
-goog.require('shaka.test.Waiter');
-goog.require('shaka.ui.Element');
-goog.require('shaka.util.Dom');
-goog.require('shaka.util.EventManager');
-goog.require('shaka.util.Iterables');
-goog.requireType('shaka.Player');
-goog.requireType('shaka.ui.Controls');
-goog.requireType('shaka.ui.Overlay');
-
-
 describe('UI', () => {
   const Util = shaka.test.Util;
   const UiUtils = shaka.test.UiUtils;
@@ -470,22 +454,6 @@ describe('UI', () => {
       expect(isChosen).not.toBe(null);
     });
 
-    it('restores the resolutions menu after audio-only playback', async () => {
-      /** @type {HTMLElement} */
-      const resolutionButton = shaka.util.Dom.getElementByClassName(
-          'shaka-resolution-button', videoContainer);
-
-      // Load an audio-only clip.  The menu should be hidden.
-      await player.load('test:sintel_audio_only_compiled');
-      expect(player.isAudioOnly()).toBe(true);
-      expect(resolutionButton.classList.contains('shaka-hidden')).toBe(true);
-
-      // Load an audio-video clip.  The menu should be visible again.
-      await player.load('test:sintel_multi_lingual_multi_res_compiled');
-      expect(player.isAudioOnly()).toBe(false);
-      expect(resolutionButton.classList.contains('shaka-hidden')).toBe(false);
-    });
-
     /**
      * @return {Element}
      */

package/test/ui/ui_unit.js

@@ -4,21 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('goog.asserts');
-goog.require('shaka.media.ManifestParser');
-goog.require('shaka.test.FakeManifestParser');
-goog.require('shaka.test.ManifestGenerator');
-goog.require('shaka.test.UiUtils');
-goog.require('shaka.test.Util');
-goog.require('shaka.ui.OverflowMenu');
-goog.require('shaka.ui.ResolutionSelection');
-goog.require('shaka.util.Functional');
-goog.require('shaka.util.Iterables');
-goog.require('shaka.util.Platform');
-goog.requireType('shaka.Player');
-goog.requireType('shaka.ui.Controls');
-goog.requireType('shaka.ui.Overlay');
-
 describe('UI', () => {
   const UiUtils = shaka.test.UiUtils;
   const Util = shaka.test.Util;
@@ -137,8 +122,7 @@ describe('UI', () => {
         // Four is just a random number I (ismena) came up with to test a
         // multi-video use case. It could be replaces with any other
         // (reasonable) number.
-        for (const _ of shaka.util.Iterables.range(4)) {
-          shaka.util.Functional.ignored(_);
+        for (let i = 0; i < 4; i++) {
           const video = /** @type {!HTMLVideoElement} */
               (document.createElement('video'));
 
@@ -658,6 +642,33 @@ describe('UI', () => {
         expect(getResolutions()).toEqual(['540p']);
       });
 
+      it('displays audio quality based on current stream', async () => {
+        const manifest =
+          shaka.test.ManifestGenerator.generate((manifest) => {
+            manifest.addVariant(0, (variant) => {
+              variant.addAudio(0);
+              variant.bandwidth = 100000;
+            });
+            manifest.addVariant(1, (variant) => {
+              variant.addAudio(1);
+              variant.bandwidth = 200000;
+            });
+          });
+
+        shaka.media.ManifestParser.registerParserByMime(
+            fakeMimeType, () => new shaka.test.FakeManifestParser(manifest));
+
+        await player.load(
+            /* uri= */ 'fake', /* startTime= */ 0, fakeMimeType);
+
+        const qualityButtons = videoContainer.querySelectorAll(
+            'button.explicit-resolution > span');
+        const qualityOptions =
+            Array.from(qualityButtons).map((btn) => btn.innerText);
+
+        expect(qualityOptions).toEqual(['200 kbits/s', '100 kbits/s']);
+      });
+
       /**
        * Use internals to update the resolution menu.  Our fake manifest can
        * cause problems with startup where the Player will get stuck using

package/test/util/abortable_operation_unit.js

@@ -4,11 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.test.Util');
-goog.require('shaka.util.AbortableOperation');
-goog.require('shaka.util.Error');
-goog.require('shaka.util.PublicPromise');
-
 describe('AbortableOperation', () => {
   const Util = shaka.test.Util;
 
@@ -392,10 +387,10 @@ describe('AbortableOperation', () => {
         expect(value).toBe(500);
       }).finally((ok) => {
         expect(ok).toBe(true);
-        // The bug https://github.com/google/shaka-player/issues/1260 makes this
-        // expectation fail because some stages were skipped.  Without this
-        // check, the test would pass, even though the bug shows up first in the
-        // basic functionality of 'chain'.
+        // The bug https://github.com/shaka-project/shaka-player/issues/1260
+        // makes this expectation fail because some stages were skipped.
+        // Without this check, the test would pass, even though the bug shows
+        // up first in the basic functionality of 'chain'.
         expect(values).toEqual([100, 200, 300, 400, 500]);
       });
       await op.promise;

package/test/util/array_utils_unit.js

@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.util.ArrayUtils');
-
 describe('ArrayUtils', () => {
   const ArrayUtils = shaka.util.ArrayUtils;