MD Settings: split browser tests per-file

chrome/test/data/webui/settings/cr_settings_browsertest.js

Index: chrome/test/data/webui/settings/cr_settings_browsertest.js
diff --git a/chrome/test/data/webui/settings/cr_settings_browsertest.js b/chrome/test/data/webui/settings/cr_settings_browsertest.js
index ce78242536fdef8618ad304b8c27aab517798b8d..1da03213b2ae2ec4b96c1e5982134856ccdf4362 100644
--- a/chrome/test/data/webui/settings/cr_settings_browsertest.js
+++ b/chrome/test/data/webui/settings/cr_settings_browsertest.js
@@ -22,21 +22,10 @@ CrSettingsBrowserTest.prototype = {
   __proto__: PolymerTest.prototype,
 
   /** @override */
-  browsePreload: 'chrome://md-settings/prefs/prefs.html',
+  browsePreload: 'about:inducebrowsercrashforrealz',

[michaelpg, 2016/06/15 02:31:48]

comment on the point of this

[Dan Beam, 2016/06/15 05:52:34]

Done.

 
-  /**
-   * TODO(dbeam): these should not be required monolithically.
-   * @override
-   */
-  extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([
-    '../fake_chrome_event.js',
-    'fake_settings_private.js',
-    'checkbox_tests.js',
-    'dropdown_menu_tests.js',
-    'pref_util_tests.js',
-    'prefs_test_cases.js',
-    'prefs_tests.js',
-  ]),
+  /** @override */
+  extraLibraries: PolymerTest.getLibraries(ROOT_PATH),
 
   /** @override */
   setUp: function() {
@@ -54,22 +43,81 @@ CrSettingsBrowserTest.prototype = {
 // Have to include command_line.h manually due to GEN calls below.
 GEN('#include "base/command_line.h"');
 
-TEST_F('CrSettingsBrowserTest', 'Checkbox', function() {
+function CrSettingsCheckboxTest() {}
+
+CrSettingsCheckboxTest.prototype = {
+  __proto__: CrSettingsBrowserTest.prototype,
+
+  /** @override */
+  browsePreload: 'chrome://md-settings/controls/settings_checkbox.html',
+
+  /** @override */
+  extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
+    'checkbox_tests.js',
+  ]),
+};
+
+TEST_F('CrSettingsCheckboxTest', 'All', function() {
   settings_checkbox.registerTests();
   mocha.run();
 });
 
-TEST_F('CrSettingsBrowserTest', 'DropdownMenu', function() {
+function CrSettingsDropdownMenuTest() {}
+
+CrSettingsDropdownMenuTest.prototype = {
+  __proto__: CrSettingsBrowserTest.prototype,
+
+  /** @override */
+  browsePreload: 'chrome://md-settings/controls/settings_dropdown_menu.html',
+
+  /** @override */
+  extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
+    'dropdown_menu_tests.js',
+  ]),
+};
+
+TEST_F('CrSettingsDropdownMenuTest', 'All', function() {
   settings_dropdown_menu.registerTests();
   mocha.run();
 });
 
-TEST_F('CrSettingsBrowserTest', 'PrefUtil', function() {
+function CrSettingsPrefUtilTest() {}
+
+CrSettingsPrefUtilTest.prototype = {
+  __proto__: CrSettingsBrowserTest.prototype,
+
+  /** @override */
+  browsePreload: 'chrome://md-settings/prefs/pref_util.html',
+
+  /** @override */
+  extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
+    'pref_util_tests.js',
+  ]),
+};
+
+TEST_F('CrSettingsPrefUtilTest', 'All', function() {
   settings_prefUtil.registerTests();
   mocha.run();
 });
 
-TEST_F('CrSettingsBrowserTest', 'Prefs', function() {
+function CrSettingsPrefsTest() {}
+
+CrSettingsPrefsTest.prototype = {
+  __proto__: CrSettingsBrowserTest.prototype,
+
+  /** @override */
+  browsePreload: 'chrome://md-settings/prefs/prefs.html',
+
+  /** @override */
+  extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
+    '../fake_chrome_event.js',
+    'fake_settings_private.js',
+    'prefs_test_cases.js',
+    'prefs_tests.js',
+  ]),
+};
+
+TEST_F('CrSettingsPrefsTest', 'All', function() {
   settings_prefs.registerTests();
   mocha.run();
 });
@@ -122,7 +170,7 @@ CrSettingsPeoplePageChangePictureTest.prototype = {
   browsePreload: 'chrome://md-settings/people_page/change_picture.html',
 
   /** @override */
-  extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([
+  extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
     'test_browser_proxy.js',
     'people_page_change_picture_test.js',
   ]),
@@ -149,7 +197,7 @@ CrSettingsPeoplePageManageProfileTest.prototype = {
   browsePreload: 'chrome://md-settings/people_page/manage_profile.html',
 
   /** @override */
-  extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([
+  extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
     'test_browser_proxy.js',
     'people_page_manage_profile_test.js',
   ]),
@@ -176,7 +224,7 @@ CrSettingsPeoplePageTest.prototype = {
   browsePreload: 'chrome://md-settings/people_page/people_page.html',
 
   /** @override */
-  extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([
+  extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
     'test_browser_proxy.js',
     'people_page_test.js',
   ]),
@@ -202,7 +250,7 @@ CrSettingsPeoplePageSyncPageTest.prototype = {
   browsePreload: 'chrome://md-settings/people_page/sync_page.html',
 
   /** @override */
-  extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([
+  extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
     'test_browser_proxy.js',
     'people_page_sync_page_test.js',
   ]),
@@ -251,7 +299,7 @@ CrSettingsResetPageTest.prototype = {
   browsePreload: 'chrome://md-settings/reset_page/reset_page.html',
 
   /** @override */
-  extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([
+  extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
     'test_browser_proxy.js',
     'test_lifetime_browser_proxy.js',
     'reset_page_test.js',
@@ -277,7 +325,7 @@ CrSettingsAppearancePageTest.prototype = {
   browsePreload: 'chrome://md-settings/appearance_page/appearance_page.html',
 
   /** @override */
-  extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([
+  extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
     ROOT_PATH + 'ui/webui/resources/js/promise_resolver.js',
     'test_browser_proxy.js',
     'appearance_page_test.js',
@@ -303,7 +351,7 @@ CrSettingsSearchPageTest.prototype = {
   browsePreload: 'chrome://md-settings/search_page/search_page.html',
 
   /** @override */
-  extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([
+  extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
     'test_browser_proxy.js',
     'test_search_engines_browser_proxy.js',
     'search_page_test.js',
@@ -330,7 +378,7 @@ CrSettingsSearchEnginesTest.prototype = {
       'chrome://md-settings/search_engines_page/search_engines_page.html',
 
   /** @override */
-  extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([
+  extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
     'test_browser_proxy.js',
     'test_search_engines_browser_proxy.js',
     'search_engines_page_test.js',
@@ -358,7 +406,7 @@ CrSettingsCertificateManagerTest.prototype = {
       'certificate_manager_page.html',
 
   /** @override */
-  extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([
+  extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
     'test_browser_proxy.js',
     'certificate_manager_page_test.js',
   ]),
@@ -384,7 +432,7 @@ CrSettingsPrivacyPageTest.prototype = {
   browsePreload: 'chrome://md-settings/privacy_page/privacy_page.html',
 
   /** @override */
-  extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([
+  extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
     ROOT_PATH + 'ui/webui/resources/js/promise_resolver.js',
     'test_browser_proxy.js',
     'privacy_page_test.js',
@@ -410,7 +458,7 @@ CrSettingsSiteSettingsTest.prototype = {
   browsePreload: 'chrome://md-settings/prefs/prefs.html',
 
   /** @override */
-  extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([
+  extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
     'site_details_tests.js',
     'site_details_permission_tests.js',
     'site_list_tests.js',
@@ -444,7 +492,7 @@ CrSettingsDevicePageTest.prototype = {
   browsePreload: 'chrome://md-settings/device_page/device_page.html',
 
   /** @override */
-  extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([
+  extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
     ROOT_PATH + 'ui/webui/resources/js/assert.js',
     '../fake_chrome_event.js',
     'fake_settings_private.js',
@@ -480,7 +528,7 @@ CrSettingsMenuTest.prototype = {
   browsePreload: 'chrome://md-settings/settings_menu/settings_menu.html',
 
   /** @override */
-  extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([
+  extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
     'settings_menu_test.js',
   ]),
 };
@@ -550,6 +598,7 @@ CrSettingsLanguagesPageTest.prototype = {
 
   /** @override */
   extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
+    '../fake_chrome_event.js',
     'fake_language_settings_private.js',
     'fake_settings_private.js',
     'languages_page_tests.js',
@@ -569,7 +618,7 @@ CrSettingsRadioGroupTest.prototype = {
   browsePreload: 'chrome://md-settings/controls/settings_radio_group.html',
 
   /** @override */
-  extraLibraries: PolymerTest.getLibraries(ROOT_PATH).concat([
+  extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
     'radio_group_tests.js',
   ]),
 };