WebUI cleanup: Convert remaining absolute chrome://test/ URLs to relative.

Also bring back |extraLibraries| override in welcome_browsertest.js (along with
a new explanatory comment), which was removed in a previous CL.

Bug: None
Change-Id: Ib3ed274af8519bbc541eeb435c6cc37abfa3611f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1860149
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Auto-Submit: Demetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#705815}

chrome/test/data/webui/cr_elements/cr_action_menu_test.js

@@ -6,7 +6,7 @@
 // #import {AnchorAlignment} from 'chrome://resources/cr_elements/cr_action_menu/cr_action_menu.m.js';
 // #import 'chrome://resources/cr_elements/cr_checkbox/cr_checkbox.m.js';
 //
-// #import {eventToPromise, flushTasks} from 'chrome://test/test_util.m.js';
+// #import {eventToPromise, flushTasks} from '../test_util.m.js';
 // #import {getDeepActiveElement} from 'chrome://resources/js/util.m.js';
 // #import {keyDownOn} from 'chrome://resources/polymer/v3_0/iron-test-helpers/mock-interactions.js';
 // #import {isMac, isWindows} from 'chrome://resources/js/cr.m.js';

chrome/test/data/webui/cr_elements/cr_button_tests.js

@@ -4,7 +4,7 @@
 
 // clang-format off
 // #import 'chrome://resources/cr_elements/cr_button/cr_button.m.js';
-// #import {eventToPromise} from 'chrome://test/test_util.m.js';
+// #import {eventToPromise} from '../test_util.m.js';
 // clang-format on
 
 suite('cr-button', function() {

chrome/test/data/webui/cr_elements/cr_checkbox_test.js

@@ -5,7 +5,7 @@
 // clang-format off
 // #import 'chrome://resources/cr_elements/cr_checkbox/cr_checkbox.m.js';
 // #import {keyDownOn, keyUpOn, pressAndReleaseKeyOn} from 'chrome://resources/polymer/v3_0/iron-test-helpers/mock-interactions.js';
-// #import {eventToPromise} from 'chrome://test/test_util.m.js';
+// #import {eventToPromise} from '../test_util.m.js';
 // clang-format on
 
 suite('cr-checkbox', function() {

chrome/test/data/webui/cr_elements/cr_dialog_test.js

@@ -5,7 +5,7 @@
 // clang-format off
 // #import 'chrome://resources/cr_elements/cr_dialog/cr_dialog.m.js';
 //
-// #import {eventToPromise, flushTasks} from 'chrome://test/test_util.m.js';
+// #import {eventToPromise, flushTasks} from '../test_util.m.js';
 // #import {keyDownOn, keyEventOn, tap} from 'chrome://resources/polymer/v3_0/iron-test-helpers/mock-interactions.js';
 // #import {Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 // clang-format on

chrome/test/data/webui/cr_elements/cr_drawer_tests.js

@@ -5,7 +5,7 @@
 // clang-format off
 // #import 'chrome://resources/cr_elements/cr_drawer/cr_drawer.m.js';
 //
-// #import {eventToPromise} from 'chrome://test/test_util.m.js';
+// #import {eventToPromise} from '../test_util.m.js';
 // #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 // clang-format on
 

chrome/test/data/webui/cr_elements/cr_expand_button_focus_tests.js

@@ -5,7 +5,7 @@
 // clang-format off
 // #import 'chrome://resources/cr_elements/cr_expand_button/cr_expand_button.m.js';
 //
-// #import {eventToPromise} from 'chrome://test/test_util.m.js';
+// #import {eventToPromise} from '../test_util.m.js';
 // #import {getDeepActiveElement} from 'chrome://resources/js/util.m.js';
 // #import {pressAndReleaseKeyOn} from 'chrome://resources/polymer/v3_0/iron-test-helpers/mock-interactions.js';
 // clang-format on

chrome/test/data/webui/cr_elements/cr_icon_button_focus_tests.js

@@ -5,7 +5,7 @@
 // clang-format off
 // #import 'chrome://resources/cr_elements/cr_icon_button/cr_icon_button.m.js';
 //
-// #import {flushTasks} from 'chrome://test/test_util.m.js';
+// #import {flushTasks} from '../test_util.m.js';
 // clang-format on
 
 suite('cr-icon-button-focus-tests', function() {

chrome/test/data/webui/cr_elements/cr_icon_button_tests.js

@@ -6,8 +6,7 @@
 // #import 'chrome://resources/cr_elements/cr_icon_button/cr_icon_button.m.js';
 
 // #import {downAndUp, pressAndReleaseKeyOn} from 'chrome://resources/polymer/v3_0/iron-test-helpers/mock-interactions.js';
-// #import {eventToPromise} from 'chrome://test/test_util.m.js';
-// #import {flushTasks} from 'chrome://test/test_util.m.js';
+// #import {eventToPromise, flushTasks} from '../test_util.m.js';
 // clang-format on
 
 suite('cr-icon-button', function() {

chrome/test/data/webui/cr_elements/cr_input_test.js

@@ -5,7 +5,7 @@
 // clang-format off
 // #import 'chrome://resources/cr_elements/cr_input/cr_input.m.js';
 // #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
-// #import {eventToPromise, whenAttributeIs} from 'chrome://test/test_util.m.js';
+// #import {eventToPromise, whenAttributeIs} from '../test_util.m.js';
 // clang-format on
 
 suite('cr-input', function() {

chrome/test/data/webui/cr_elements/cr_radio_group_test.js

@@ -6,7 +6,7 @@
 // #import 'chrome://resources/cr_elements/cr_radio_group/cr_radio_group.m.js';
 // #import 'chrome://resources/cr_elements/cr_radio_button/cr_radio_button.m.js';
 //
-// #import {eventToPromise} from 'chrome://test/test_util.m.js';
+// #import {eventToPromise} from '../test_util.m.js';
 // #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 // #import {pressAndReleaseKeyOn} from 'chrome://resources/polymer/v3_0/iron-test-helpers/mock-interactions.js';
 // clang-format on

chrome/test/data/webui/cr_elements/cr_search_field_tests.js

@@ -6,7 +6,7 @@
 // #import 'chrome://resources/cr_elements/cr_search_field/cr_search_field.m.js';
 //
 // #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
-// #import {flushTasks} from 'chrome://test/test_util.m.js';
+// #import {flushTasks} from '../test_util.m.js';
 // clang-format on
 
 /** @fileoverview Suite of tests for cr-search-field. */

chrome/test/data/webui/cr_elements/cr_tabs_test.js

@@ -4,7 +4,7 @@
 
 // clang-format off
 // #import 'chrome://resources/cr_elements/cr_tabs/cr_tabs.m.js';
-// #import {eventToPromise, flushTasks} from 'chrome://test/test_util.m.js';
+// #import {eventToPromise, flushTasks} from '../test_util.m.js';
 // #import {getDeepActiveElement} from 'chrome://resources/js/util.m.js';
 // #import {keyDownOn} from 'chrome://resources/polymer/v3_0/iron-test-helpers/mock-interactions.js';
 // clang-format on

chrome/test/data/webui/cr_elements/cr_toast_manager_test.js

@@ -4,7 +4,7 @@
 
 // clang-format off
 // #import {getInstance} from 'chrome://resources/cr_elements/cr_toast/cr_toast_manager.m.js';
-// #import {eventToPromise} from 'chrome://test/test_util.m.js';
+// #import {eventToPromise} from '../test_util.m.js';
 // clang-format on
 
 suite('cr-toast-manager', () => {

chrome/test/data/webui/cr_elements/cr_toast_test.js

@@ -4,7 +4,7 @@
 
 // clang-format off
 // #import 'chrome://resources/cr_elements/cr_toast/cr_toast.m.js';
-// #import {MockTimer} from 'chrome://test/mock_timer.m.js';
+// #import {MockTimer} from '../mock_timer.m.js';
 // clang-format on
 
 suite('cr-toast', function() {

chrome/test/data/webui/cr_elements/cr_toggle_test.js

@@ -5,7 +5,7 @@
 // clang-format off
 // #import 'chrome://resources/cr_elements/cr_toggle/cr_toggle.m.js';
 // #import {keyEventOn} from 'chrome://resources/polymer/v3_0/iron-test-helpers/mock-interactions.js';
-// #import {eventToPromise} from 'chrome://test/test_util.m.js';
+// #import {eventToPromise} from '../test_util.m.js';
 // clang-format on
 
 suite('cr-toggle', function() {

chrome/test/data/webui/cr_elements/cr_view_manager_test.js

@@ -5,7 +5,7 @@
 // clang-format off
 // #import 'chrome://resources/cr_elements/cr_view_manager/cr_view_manager.m.js';
 // #import {assert} from 'chrome://resources/js/assert.m.js';
-// #import {isVisible} from 'chrome://test/test_util.m.js';
+// #import {isVisible} from '../test_util.m.js';
 // clang-format on
 
 /** @fileoverview Suite of tests for cr-view-manager. */

chrome/test/data/webui/welcome/navigation_behavior_test.js

@@ -3,9 +3,10 @@
 // found in the LICENSE file.
 
 import {Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
-import {eventToPromise} from 'chrome://test/test_util.m.js';
 import {navigateTo, navigateToNextStep, NavigationBehavior, Routes} from 'chrome://welcome/navigation_behavior.js';
 
+import {eventToPromise} from '../test_util.m.js';
+
 suite('NavigationBehaviorTest', function() {
   let elements = [];
   let callOrders = [];

chrome/test/data/webui/welcome/nux_set_as_default_test.js

@@ -5,9 +5,10 @@
 import 'chrome://welcome/set_as_default/nux_set_as_default.js';
 
 import {webUIListenerCallback} from 'chrome://resources/js/cr.m.js';
-import {eventToPromise} from 'chrome://test/test_util.m.js';
 import {NuxSetAsDefaultProxyImpl} from 'chrome://welcome/set_as_default/nux_set_as_default_proxy.js';
 
+import {eventToPromise} from '../test_util.m.js';
+
 import {TestNuxSetAsDefaultProxy} from './test_nux_set_as_default_proxy.js';
 
 suite('SetAsDefaultTest', function() {

chrome/test/data/webui/welcome/test_bookmark_proxy.js

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {TestBrowserProxy} from 'chrome://test/test_browser_proxy.m.js';
+import {TestBrowserProxy} from '../test_browser_proxy.m.js';
 
 /** @implements {BookmarkProxy} */
 export class TestBookmarkProxy extends TestBrowserProxy {

chrome/test/data/webui/welcome/test_google_app_proxy.js

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {TestBrowserProxy} from 'chrome://test/test_browser_proxy.m.js';
+import {TestBrowserProxy} from '../test_browser_proxy.m.js';
 
 /** @implements {GoogleAppProxy} */
 export class TestGoogleAppProxy extends TestBrowserProxy {

chrome/test/data/webui/welcome/test_landing_view_proxy.js

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {TestBrowserProxy} from 'chrome://test/test_browser_proxy.m.js';
+import {TestBrowserProxy} from '../test_browser_proxy.m.js';
 
 /** @implements {LandingViewProxy} */
 export class TestLandingViewProxy extends TestBrowserProxy {

chrome/test/data/webui/welcome/test_metrics_proxy.js

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {TestBrowserProxy} from 'chrome://test/test_browser_proxy.m.js';
+import {TestBrowserProxy} from '../test_browser_proxy.m.js';
 
 /** @implements {ModuleMetricsProxy} */
 export class TestMetricsProxy extends TestBrowserProxy {

chrome/test/data/webui/welcome/test_ntp_background_proxy.js

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {TestBrowserProxy} from 'chrome://test/test_browser_proxy.m.js';
+import {TestBrowserProxy} from '../test_browser_proxy.m.js';
 
 /** @implements {NtpBackgroundProxy} */
 export class TestNtpBackgroundProxy extends TestBrowserProxy {

chrome/test/data/webui/welcome/test_nux_set_as_default_proxy.js

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {TestBrowserProxy} from 'chrome://test/test_browser_proxy.m.js';
+import {TestBrowserProxy} from '../test_browser_proxy.m.js';
 
 /** @implements {NuxSetAsDefaultProxy} */
 export class TestNuxSetAsDefaultProxy extends TestBrowserProxy {

chrome/test/data/webui/welcome/test_signin_view_proxy.js

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {TestBrowserProxy} from 'chrome://test/test_browser_proxy.m.js';
+import {TestBrowserProxy} from '../test_browser_proxy.m.js';
 
 /** @implements {SigninViewProxy} */
 export class TestSigninViewProxy extends TestBrowserProxy {

chrome/test/data/webui/welcome/test_welcome_browser_proxy.js

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {TestBrowserProxy} from 'chrome://test/test_browser_proxy.m.js';
+import {TestBrowserProxy} from '../test_browser_proxy.m.js';
 
 /** @implements {WelcomeBrowserProxy} */
 export class TestWelcomeBrowserProxy extends TestBrowserProxy {

chrome/test/data/webui/welcome/welcome_app_test.js

@@ -4,7 +4,6 @@
 
 import 'chrome://welcome/welcome_app.js';
 
-import {waitBeforeNextRender} from 'chrome://test/test_util.m.js';
 import {LandingViewProxyImpl} from 'chrome://welcome/landing_view_proxy.js';
 import {navigateTo, Routes} from 'chrome://welcome/navigation_behavior.js';
 import {NuxSetAsDefaultProxyImpl} from 'chrome://welcome/set_as_default/nux_set_as_default_proxy.js';
@@ -12,6 +11,8 @@ import {BookmarkProxyImpl} from 'chrome://welcome/shared/bookmark_proxy.js';
 import {ModuleMetricsProxyImpl} from 'chrome://welcome/shared/module_metrics_proxy.js';
 import {WelcomeBrowserProxyImpl} from 'chrome://welcome/welcome_browser_proxy.js';
 
+import {waitBeforeNextRender} from '../test_util.m.js';
+
 import {TestBookmarkProxy} from './test_bookmark_proxy.js';
 import {TestLandingViewProxy} from './test_landing_view_proxy.js';
 import {TestMetricsProxy} from './test_metrics_proxy.js';

chrome/test/data/webui/welcome/welcome_browsertest.js

@@ -16,6 +16,18 @@ const WelcomeBrowserTest = class extends PolymerTest {
     throw 'this is abstract and should be overridden by subclasses';
   }
 
+  /**
+   * Override default |extraLibraries| since PolymerTest includes more than are
+   * needed in JS Module based tests.
+   * @override
+   */
+  get extraLibraries() {
+    return [
+      '//third_party/mocha/mocha.js',
+      '//chrome/test/data/webui/mocha_adapter.js',
+    ];
+  }
+
   /** @override */
   get webuiHost() {
     return 'welcome';