shaka-player 3.3.2 → 3.3.5

package/test/text/simple_text_displayer_unit.js

@@ -4,13 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-
-goog.require('shaka.test.FakeVideo');
-goog.require('shaka.text.Cue');
-goog.require('shaka.text.SimpleTextDisplayer');
-goog.require('shaka.util.Functional');
-goog.requireType('shaka.test.FakeTextTrack');
-
 describe('SimpleTextDisplayer', () => {
   const originalVTTCue = window.VTTCue;
   const Cue = shaka.text.Cue;
@@ -74,7 +67,7 @@ describe('SimpleTextDisplayer', () => {
     });
 
     it('appends equal time cues in reverse order', () => {
-      // Regression test for https://github.com/google/shaka-player/issues/848
+      // Regression test for https://github.com/shaka-project/shaka-player/issues/848
 
       // When VTTCue is seen as the real thing (because of the presence of
       // VTTCue.prototype.line), then the reverse-order behavior comes into

package/test/text/srt_text_parser_unit.js

@@ -4,10 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.text.SrtTextParser');
-goog.require('shaka.util.BufferUtils');
-goog.require('shaka.util.StringUtils');
-
 describe('SrtTextParser', () => {
   it('supports no cues', () => {
     verifyHelper([],

package/test/text/ssa_text_parser_unit.js

@@ -4,11 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.text.Cue');
-goog.require('shaka.text.SsaTextParser');
-goog.require('shaka.util.BufferUtils');
-goog.require('shaka.util.StringUtils');
-
 describe('SsaTextParser', () => {
   const Cue = shaka.text.Cue;
 

package/test/text/text_engine_unit.js

@@ -4,11 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.test.FakeTextDisplayer');
-goog.require('shaka.text.Cue');
-goog.require('shaka.text.TextEngine');
-goog.require('shaka.util.MimeUtils');
-
 describe('TextEngine', () => {
   const TextEngine = shaka.text.TextEngine;
 
@@ -336,7 +331,7 @@ describe('TextEngine', () => {
     it('does not use timestamp offset', async () => {
       // The start and end times passed to appendBuffer are now absolute, so
       // they already account for timestampOffset and period offset.
-      // See https://github.com/google/shaka-player/issues/1562
+      // See https://github.com/shaka-project/shaka-player/issues/1562
       textEngine.setTimestampOffset(60);
       await textEngine.appendBuffer(dummyData, 0, 3);
       expect(textEngine.bufferStart()).toBe(0);
@@ -379,7 +374,7 @@ describe('TextEngine', () => {
     it('does not use timestamp offset', async () => {
       // The start and end times passed to appendBuffer are now absolute, so
       // they already account for timestampOffset and period offset.
-      // See https://github.com/google/shaka-player/issues/1562
+      // See https://github.com/shaka-project/shaka-player/issues/1562
       textEngine.setTimestampOffset(60);
       await textEngine.appendBuffer(dummyData, 3, 6);
       expect(textEngine.bufferedAheadOf(4)).toBe(2);

package/test/text/text_track_integration.js

@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.test.UiUtils');
-
 // This tests three assumptions we make about text tracks in Shaka Player:
 //   1. If a non-null value for cues is stored, it will always be the
 //      non-null value for cues when cues returns a non-null value.

package/test/text/ttml_text_parser_unit.js

@@ -4,15 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.test.TtmlUtils');
-goog.require('shaka.test.Util');
-goog.require('shaka.text.Cue');
-goog.require('shaka.text.CueRegion');
-goog.require('shaka.text.TtmlTextParser');
-goog.require('shaka.util.BufferUtils');
-goog.require('shaka.util.Error');
-goog.require('shaka.util.StringUtils');
-
 describe('TtmlTextParser', () => {
   const Cue = shaka.text.Cue;
   const CueRegion = shaka.text.CueRegion;
@@ -1718,7 +1709,7 @@ describe('TtmlTextParser', () => {
         {startTime: 1, endTime: 4});
   });
 
-  // Regression test for https://github.com/google/shaka-player/issues/2478
+  // Regression test for https://github.com/shaka-project/shaka-player/issues/2478
   it('supports nested cues with only non-ASCII characters', () => {
     verifyHelper(
         [
@@ -1920,7 +1911,7 @@ describe('TtmlTextParser', () => {
     );
   });
 
-  // Regression test for https://github.com/google/shaka-player/issues/3743
+  // Regression test for https://github.com/shaka-project/shaka-player/issues/3743
   it('inherits styles from other styles on nestedCues', () => {
     verifyHelper(
         [

package/test/text/ui_text_displayer_unit.js

@@ -4,10 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.test.Util');
-goog.require('shaka.text.Cue');
-goog.require('shaka.text.UITextDisplayer');
-
 describe('UITextDisplayer', () => {
   /** @type {!HTMLElement} */
   let videoContainer;
@@ -65,7 +61,18 @@ describe('UITextDisplayer', () => {
     document.body.removeChild(videoContainer);
   });
 
-  it('correctly displays styles for cues', async () => {
+  /**
+   * @suppress {visibility}
+   * "suppress visibility" has function scope, so this is a mini-function that
+   * exists solely to suppress visibility rules for these actions.
+   */
+  function updateCaptions() {
+    // Rather than wait for a timer, which can be unreliable on Safari when the
+    // device is heavily loaded, trigger the update explicitly.
+    textDisplayer.updateCaptions_();
+  }
+
+  it('correctly displays styles for cues', () => {
     /** @type {!shaka.text.Cue} */
     const cue = new shaka.text.Cue(0, 100, 'Captain\'s log.');
     cue.color = 'green';
@@ -81,8 +88,7 @@ describe('UITextDisplayer', () => {
 
     textDisplayer.setTextVisibility(true);
     textDisplayer.append([cue]);
-    // Wait until updateCaptions_() gets called.
-    await shaka.test.Util.delay(0.5);
+    updateCaptions();
 
     const textContainer = videoContainer.querySelector('.shaka-text-container');
     const captions = textContainer.querySelector('div');
@@ -114,7 +120,7 @@ describe('UITextDisplayer', () => {
         .toEqual(jasmine.objectContaining({'background-color': 'black'}));
   });
 
-  it('correctly displays styles for nested cues', async () => {
+  it('correctly displays styles for nested cues', () => {
     /** @type {!shaka.text.Cue} */
     const cue = new shaka.text.Cue(0, 100, '');
     const nestedCue = new shaka.text.Cue(0, 100, 'Captain\'s log.');
@@ -131,8 +137,7 @@ describe('UITextDisplayer', () => {
 
     textDisplayer.setTextVisibility(true);
     textDisplayer.append([cue]);
-    // Wait until updateCaptions_() gets called.
-    await shaka.test.Util.delay(0.5);
+    updateCaptions();
 
     // Verify styles applied to the nested cues.
     const textContainer = videoContainer.querySelector('.shaka-text-container');
@@ -165,7 +170,7 @@ describe('UITextDisplayer', () => {
         .toEqual(jasmine.objectContaining({'background-color': 'black'}));
   });
 
-  it('correctly displays styles for cellResolution units', async () => {
+  it('correctly displays styles for cellResolution units', () => {
     /** @type {!shaka.text.Cue} */
     const cue = new shaka.text.Cue(0, 100, 'Captain\'s log.');
     cue.fontSize = '0.80c';
@@ -177,8 +182,7 @@ describe('UITextDisplayer', () => {
 
     textDisplayer.setTextVisibility(true);
     textDisplayer.append([cue]);
-    // Wait until updateCaptions_() gets called.
-    await shaka.test.Util.delay(0.5);
+    updateCaptions();
 
     // Expected value is calculated based on  ttp:cellResolution="60 20"
     // videoContainerHeight=450px and tts:fontSize="0.80c" on the default style.
@@ -200,7 +204,7 @@ describe('UITextDisplayer', () => {
         }));
   });
 
-  it('correctly displays styles for percentages units', async () => {
+  it('correctly displays styles for percentages units', () => {
     /** @type {!shaka.text.Cue} */
     const cue = new shaka.text.Cue(0, 100, 'Captain\'s log.');
     cue.fontSize = '90%';
@@ -211,8 +215,7 @@ describe('UITextDisplayer', () => {
 
     textDisplayer.setTextVisibility(true);
     textDisplayer.append([cue]);
-    // Wait until updateCaptions_() gets called.
-    await shaka.test.Util.delay(0.5);
+    updateCaptions();
 
     // Expected value is calculated based on  ttp:cellResolution="32 15"
     // videoContainerHeight=450px and tts:fontSize="90%" on the default style.
@@ -225,15 +228,15 @@ describe('UITextDisplayer', () => {
         jasmine.objectContaining({'font-size': expectedFontSize}));
   });
 
-  it('does not display duplicate cues', async () => {
+  it('does not display duplicate cues', () => {
     // These are identical.
     const cue1 = new shaka.text.Cue(0, 100, 'Captain\'s log.');
     const cue2 = new shaka.text.Cue(0, 100, 'Captain\'s log.');
 
     textDisplayer.setTextVisibility(true);
     textDisplayer.append([cue1]);
-    // Wait until updateCaptions_() gets called.
-    await shaka.test.Util.delay(0.5);
+    updateCaptions();
+
     /** @type {Element} */
     const textContainer = videoContainer.querySelector('.shaka-text-container');
     let captions = textContainer.querySelectorAll('div');
@@ -241,14 +244,14 @@ describe('UITextDisplayer', () => {
     expect(captions.length).toBe(1);
 
     textDisplayer.append([cue2]);
-    // Wait until updateCaptions_() gets called.
-    await shaka.test.Util.delay(0.5);
+    updateCaptions();
+
     captions = textContainer.querySelectorAll('div');
     // Expect textContainer to display one cue without duplication.
     expect(captions.length).toBe(1);
   });
 
-  it('does not mistake cues with nested cues as duplicates', async () => {
+  it('does not mistake cues with nested cues as duplicates', () => {
     // These are not identical, but might look like it at the top level.
     const cue1 = new shaka.text.Cue(0, 100, '');
     cue1.nestedCues = [
@@ -265,8 +268,8 @@ describe('UITextDisplayer', () => {
 
     textDisplayer.setTextVisibility(true);
     textDisplayer.append([cue1]);
-    // Wait until updateCaptions_() gets called.
-    await shaka.test.Util.delay(0.5);
+    updateCaptions();
+
     /** @type {Element} */
     const textContainer = videoContainer.querySelector('.shaka-text-container');
     let captions = textContainer.querySelectorAll('div');
@@ -274,15 +277,15 @@ describe('UITextDisplayer', () => {
     expect(captions.length).toBe(1);
 
     textDisplayer.append([cue2, cue3]);
-    // Wait until updateCaptions_() gets called.
-    await shaka.test.Util.delay(0.5);
+    updateCaptions();
+
     captions = textContainer.querySelectorAll('div');
     // Expect textContainer to display all three cues, since they are not truly
     // duplicates.
     expect(captions.length).toBe(3);
   });
 
-  it('does not mistake cues with different styles duplicates', async () => {
+  it('does not mistake cues with different styles duplicates', () => {
     // These all have the same text and timing, but different styles.
     const cue1 = new shaka.text.Cue(0, 100, 'Hello!');
     cue1.color = 'green';
@@ -296,8 +299,8 @@ describe('UITextDisplayer', () => {
 
     textDisplayer.setTextVisibility(true);
     textDisplayer.append([cue1]);
-    // Wait until updateCaptions_() gets called.
-    await shaka.test.Util.delay(0.5);
+    updateCaptions();
+
     /** @type {Element} */
     const textContainer = videoContainer.querySelector('.shaka-text-container');
     let captions = textContainer.querySelectorAll('div');
@@ -305,20 +308,20 @@ describe('UITextDisplayer', () => {
     expect(captions.length).toBe(1);
 
     textDisplayer.append([cue2, cue3]);
-    // Wait until updateCaptions_() gets called.
-    await shaka.test.Util.delay(0.5);
+    updateCaptions();
+
     captions = textContainer.querySelectorAll('div');
     // Expect textContainer to display all three cues, since they are not truly
     // duplicates.
     expect(captions.length).toBe(3);
   });
 
-  it('hides currently displayed cue when removed', async () => {
+  it('hides currently displayed cue when removed', () => {
     const cue = new shaka.text.Cue(0, 50, 'One');
     textDisplayer.setTextVisibility(true);
     textDisplayer.append([cue]);
     video.currentTime = 10;
-    await shaka.test.Util.delay(0.5);
+    updateCaptions();
     const textContainer = videoContainer.querySelector('.shaka-text-container');
 
     let cueElements = textContainer.querySelectorAll('div');
@@ -331,7 +334,7 @@ describe('UITextDisplayer', () => {
     expect(cueElements.length).toBe(0);
   });
 
-  it('hides and shows nested cues at appropriate times', async () => {
+  it('hides and shows nested cues at appropriate times', () => {
     const parentCue1 = new shaka.text.Cue(0, 100, '');
     const cue1 = new shaka.text.Cue(0, 50, 'One');
     parentCue1.nestedCues.push(cue1);
@@ -348,7 +351,7 @@ describe('UITextDisplayer', () => {
     textDisplayer.append([parentCue1, parentCue2]);
 
     video.currentTime = 10;
-    await shaka.test.Util.delay(0.5);
+    updateCaptions();
     /** @type {Element} */
     const textContainer = videoContainer.querySelector('.shaka-text-container');
     let parentCueElements = textContainer.querySelectorAll('div');
@@ -357,38 +360,38 @@ describe('UITextDisplayer', () => {
     expect(parentCueElements[0].textContent).toBe('One');
 
     video.currentTime = 35;
-    await shaka.test.Util.delay(0.5);
+    updateCaptions();
     parentCueElements = textContainer.querySelectorAll('div');
     expect(parentCueElements.length).toBe(1);
     expect(parentCueElements[0].textContent).toBe('OneTwo');
 
     video.currentTime = 60;
-    await shaka.test.Util.delay(0.5);
+    updateCaptions();
     parentCueElements = textContainer.querySelectorAll('div');
     expect(parentCueElements.length).toBe(1);
     expect(parentCueElements[0].textContent).toBe('TwoThree');
 
     video.currentTime = 85;
-    await shaka.test.Util.delay(0.5);
+    updateCaptions();
     parentCueElements = textContainer.querySelectorAll('div');
     expect(parentCueElements.length).toBe(1);
     expect(parentCueElements[0].textContent).toBe('Three');
 
     video.currentTime = 95;
-    await shaka.test.Util.delay(0.5);
+    updateCaptions();
     parentCueElements = textContainer.querySelectorAll('div');
     expect(parentCueElements.length).toBe(2);
     expect(parentCueElements[0].textContent).toBe('Three');
     expect(parentCueElements[1].textContent).toBe('Four');
 
     video.currentTime = 105;
-    await shaka.test.Util.delay(0.5);
+    updateCaptions();
     parentCueElements = textContainer.querySelectorAll('div');
     expect(parentCueElements.length).toBe(1);
     expect(parentCueElements[0].textContent).toBe('Four');
 
     video.currentTime = 150;
-    await shaka.test.Util.delay(0.5);
+    updateCaptions();
     parentCueElements = textContainer.querySelectorAll('div');
     expect(parentCueElements.length).toBe(1);
     expect(parentCueElements[0].textContent).toBe('');

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;

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;

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'));
 

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;
 

package/test/util/buffer_utils_unit.js

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

package/test/util/cmcd_manager_unit.js

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

package/test/util/data_view_reader_unit.js

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

package/test/util/ebml_parser_unit.js

@@ -4,10 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.test.Util');
-goog.require('shaka.util.EbmlParser');
-goog.require('shaka.util.Error');
-
 describe('EbmlParser', /** @suppress {accessControls} */ () => {
   const Util = shaka.test.Util;
 

package/test/util/event_manager_unit.js

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

package/test/util/fake_event_target_unit.js

@@ -4,11 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.log');
-goog.require('shaka.test.Util');
-goog.require('shaka.util.FakeEvent');
-goog.require('shaka.util.FakeEventTarget');
-
 describe('FakeEventTarget', () => {
   const Util = shaka.test.Util;
   const originalLogError = shaka.log.error;

package/test/util/functional_unit.js

@@ -73,7 +73,7 @@ describe('Functional', () => {
       expect(obj.val).toBe(1);
     });
 
-    // Regression test for https://github.com/google/shaka-player/issues/2958
+    // Regression test for https://github.com/shaka-project/shaka-player/issues/2958
     it('supports ES6 classes', () => {
       const obj = Functional.callFactory(Es6Class);
       expect(obj.val).toBe(1);