Welcome WebUI cleanup: Use more relative chrome://test/ URLs in tests.

Also remove unnecessary |extraLibraries| since those are included
for every WebUI test anyway.

Bug: None
Change-Id: I0da58060b0ea8b5218c9f65d4179d8f631f0bfc4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1857185
Commit-Queue: John Lee <johntlee@chromium.org>
Auto-Submit: Demetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: John Lee <johntlee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#705626}

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

@@ -4,13 +4,14 @@
 
 import 'chrome://welcome/google_apps/nux_google_apps.js';
 
-import {TestBookmarkProxy} from 'chrome://test/welcome/test_bookmark_proxy.js';
-import {TestGoogleAppProxy} from 'chrome://test/welcome/test_google_app_proxy.js';
-import {TestMetricsProxy} from 'chrome://test/welcome/test_metrics_proxy.js';
 import {GoogleAppProxyImpl} from 'chrome://welcome/google_apps/google_app_proxy.js';
 import {GoogleAppsMetricsProxyImpl} from 'chrome://welcome/google_apps/google_apps_metrics_proxy.js';
 import {BookmarkBarManager, BookmarkProxyImpl} from 'chrome://welcome/shared/bookmark_proxy.js';
 
+import {TestBookmarkProxy} from './test_bookmark_proxy.js';
+import {TestGoogleAppProxy} from './test_google_app_proxy.js';
+import {TestMetricsProxy} from './test_metrics_proxy.js';
+
 suite('AppChooserTest', function() {
   const apps = [
     {

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

@@ -2,9 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {TestMetricsProxy} from 'chrome://test/welcome/test_metrics_proxy.js';
 import {ModuleMetricsManager} from 'chrome://welcome/shared/module_metrics_proxy.js';
 
+import {TestMetricsProxy} from './test_metrics_proxy.js';
+
 suite('ModuleMetricsTest', function() {
   /** @type {ModuleMetricsProxy} */
   let testMetricsProxy;

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

@@ -4,11 +4,12 @@
 
 import 'chrome://welcome/ntp_background/nux_ntp_background.js';
 
-import {TestMetricsProxy} from 'chrome://test/welcome/test_metrics_proxy.js';
-import {TestNtpBackgroundProxy} from 'chrome://test/welcome/test_ntp_background_proxy.js';
 import {NtpBackgroundMetricsProxyImpl} from 'chrome://welcome/ntp_background/ntp_background_metrics_proxy.js';
 import {NtpBackgroundProxyImpl} from 'chrome://welcome/ntp_background/ntp_background_proxy.js';
 
+import {TestMetricsProxy} from './test_metrics_proxy.js';
+import {TestNtpBackgroundProxy} from './test_ntp_background_proxy.js';
+
 suite('NuxNtpBackgroundTest', function() {
   /** @type {!Array<!NtpBackgroundData} */
   let backgrounds = [

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

@@ -6,9 +6,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 {TestNuxSetAsDefaultProxy} from 'chrome://test/welcome/test_nux_set_as_default_proxy.js';
 import {NuxSetAsDefaultProxyImpl} from 'chrome://welcome/set_as_default/nux_set_as_default_proxy.js';
 
+import {TestNuxSetAsDefaultProxy} from './test_nux_set_as_default_proxy.js';
+
 suite('SetAsDefaultTest', function() {
   /** @type {NuxSetAsDefaultElement} */
   let testElement;

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

@@ -4,11 +4,12 @@
 
 import 'chrome://welcome/signin_view.js';
 
-import {TestSigninViewProxy} from 'chrome://test/welcome/test_signin_view_proxy.js';
-import {TestWelcomeBrowserProxy} from 'chrome://test/welcome/test_welcome_browser_proxy.js';
 import {SigninViewProxyImpl} from 'chrome://welcome/signin_view_proxy.js';
 import {WelcomeBrowserProxyImpl} from 'chrome://welcome/welcome_browser_proxy.js';
 
+import {TestSigninViewProxy} from './test_signin_view_proxy.js';
+import {TestWelcomeBrowserProxy} from './test_welcome_browser_proxy.js';
+
 suite('SigninViewTest', function() {
   /** @type {SigninViewElement} */
   let testElement;

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

@@ -5,11 +5,6 @@
 import 'chrome://welcome/welcome_app.js';
 
 import {waitBeforeNextRender} from 'chrome://test/test_util.m.js';
-import {TestBookmarkProxy} from 'chrome://test/welcome/test_bookmark_proxy.js';
-import {TestLandingViewProxy} from 'chrome://test/welcome/test_landing_view_proxy.js';
-import {TestMetricsProxy} from 'chrome://test/welcome/test_metrics_proxy.js';
-import {TestNuxSetAsDefaultProxy} from 'chrome://test/welcome/test_nux_set_as_default_proxy.js';
-import {TestWelcomeBrowserProxy} from 'chrome://test/welcome/test_welcome_browser_proxy.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';
@@ -17,6 +12,12 @@ 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 {TestBookmarkProxy} from './test_bookmark_proxy.js';
+import {TestLandingViewProxy} from './test_landing_view_proxy.js';
+import {TestMetricsProxy} from './test_metrics_proxy.js';
+import {TestNuxSetAsDefaultProxy} from './test_nux_set_as_default_proxy.js';
+import {TestWelcomeBrowserProxy} from './test_welcome_browser_proxy.js';
+
 suite('WelcomeWelcomeAppTest', function() {
   /** @type {WelcomeAppElement} */
   let testElement;

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

@@ -16,14 +16,6 @@ const WelcomeBrowserTest = class extends PolymerTest {
     throw 'this is abstract and should be overridden by subclasses';
   }
 
-  /** @override */
-  get extraLibraries() {
-    return [
-      '//third_party/mocha/mocha.js',
-      '//chrome/test/data/webui/mocha_adapter.js',
-    ];
-  }
-
   /** @override */
   get webuiHost() {
     return 'welcome';