cr_components: Refactor chromeos tests into a new browser_tests target.

This is in preparation for adding more tests for CrOS-specific
cr_components.

R=khorimoto@chromium.org

Bug: none
Test: CrComponents*Test
Change-Id: Icfb887e992f5bd3d4e429c369d900effc8e4320e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2342252
Commit-Queue: James Hawkins <jhawkins@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#796195}

chrome/test/data/webui/BUILD.gn

@@ -134,6 +134,7 @@ if (include_js_tests) {
         "../chromeos/oobe_webui_browsertest.js",
         "chromeos/edu_login/edu_login_browsertest.js",
         "chromeos/gaia_action_buttons/gaia_action_buttons_browsertest.js",
+        "cr_components/chromeos/cr_components_chromeos_browsertest.js",
         "nearby_share/shared/nearby_shared_browsertest.js",
         "set_time_dialog_browsertest.js",
         "settings/chromeos/a11y/crostini_settings_details_a11y_test.js",

chrome/test/data/webui/cr_components/chromeos/cr_components_chromeos_browsertest.js

+// Copyright 2020 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+/** @fileoverview Tests for shared Polymer components. */
+
+// Polymer BrowserTest fixture.
+GEN_INCLUDE(['//chrome/test/data/webui/polymer_browser_test_base.js']);
+
+GEN('#include "content/public/test/browser_test.h"');
+
+// Polymer 2 test list format:
+//
+// ['ModuleNameTest', 'module.js',
+//   [<module.js dependency source list>]
+// ]
+[
+  ['CrPolicyNetworkBehaviorMojo', 'cr_policy_network_behavior_mojo_tests.js',
+    ['../../cr_elements/cr_policy_strings.js']
+  ],
+  ['NetworkConfig', 'network_config_test.js',
+    [
+      '//ui/webui/resources/js/assert.js',
+      '//ui/webui/resources/js/promise_resolver.js',
+      '../../fake_chrome_event.js',
+      '../../chromeos/networking_private_constants.js',
+      '../../chromeos/fake_network_config_mojom.js',
+    ]
+  ],
+  ['PolicyNetworkIndicatorMojo', 'cr_policy_network_indicator_mojo_tests.js',
+    [
+      '../../cr_elements/cr_policy_strings.js',
+    ]
+  ],
+].forEach(test => registerTest(...test));
+
+function registerTest(testName, module, deps) {
+  const className = `CrComponents${testName}Test`;
+  this[className] = class extends PolymerTest {
+    /** @override */
+    get browsePreload() {
+      return `chrome://os-settings/test_loader.html?module=settings/chromeos/${module}`;
+    }
+
+    /** @override */
+    get extraLibraries() {
+      return PolymerTest.prototype.extraLibraries.concat(module).concat(deps);
+    }
+  };
+
+  TEST_F(className, 'All', () => mocha.run());
+}

chrome/test/data/webui/cr_components/cr_components_browsertest.js

@@ -7,8 +7,6 @@
 // Polymer BrowserTest fixture.
 GEN_INCLUDE(['//chrome/test/data/webui/polymer_browser_test_base.js']);
 
-GEN('#include "chrome/browser/browser_features.h"');
-GEN('#include "chrome/browser/ui/ui_features.h"');
 GEN('#include "content/public/test/browser_test.h"');
 
 /**
@@ -72,82 +70,3 @@ TEST_F('CrComponentsManagedFootnoteTest', 'LoadTimeDataDevice', function() {
 });
 
 GEN('#endif');
-
-GEN('#if defined(OS_CHROMEOS)');
-/**
- * @constructor
- * @extends {CrComponentsBrowserTest}
- */
-function CrPolicyNetworkBehaviorMojoTest() {}
-
-CrPolicyNetworkBehaviorMojoTest.prototype = {
-  __proto__: CrComponentsBrowserTest.prototype,
-
-  /** @override */
-  browsePreload:
-      'chrome://os-settings/chromeos/internet_page/internet_page.html',
-
-  /** @override */
-  extraLibraries: CrComponentsBrowserTest.prototype.extraLibraries.concat([
-    '../cr_elements/cr_policy_strings.js',
-    'cr_policy_network_behavior_mojo_tests.js',
-  ]),
-};
-
-TEST_F('CrPolicyNetworkBehaviorMojoTest', 'All', function() {
-  mocha.run();
-});
-
-/**
- * @constructor
- * @extends {CrComponentsBrowserTest}
- */
-function CrComponentsPolicyNetworkIndicatorMojoTest() {}
-
-CrComponentsPolicyNetworkIndicatorMojoTest.prototype = {
-  __proto__: CrComponentsBrowserTest.prototype,
-
-  /** @override */
-  browsePreload:
-      'chrome://os-settings/chromeos/internet_page/internet_page.html',
-
-  /** @override */
-  extraLibraries: CrComponentsBrowserTest.prototype.extraLibraries.concat([
-    '../cr_elements/cr_policy_strings.js',
-    'cr_policy_network_indicator_mojo_tests.js',
-  ]),
-};
-
-TEST_F('CrComponentsPolicyNetworkIndicatorMojoTest', 'All', function() {
-  mocha.run();
-});
-
-/**
- * @constructor
- * @extends {CrComponentsBrowserTest}
- */
-function CrComponentsNetworkConfigTest() {}
-
-CrComponentsNetworkConfigTest.prototype = {
-  __proto__: CrComponentsBrowserTest.prototype,
-
-  /** @override */
-
-  browsePreload: 'chrome://internet-config-dialog',
-
-  /** @override */
-  extraLibraries: CrComponentsBrowserTest.prototype.extraLibraries.concat([
-    '//ui/webui/resources/js/assert.js',
-    '//ui/webui/resources/js/promise_resolver.js',
-    '../fake_chrome_event.js',
-    '../chromeos/networking_private_constants.js',
-    '../chromeos/fake_network_config_mojom.js',
-    'network_config_test.js',
-  ]),
-};
-
-TEST_F('CrComponentsNetworkConfigTest', 'All', function() {
-  mocha.run();
-});
-
-GEN('#endif');