Timing issues in tests for settings-main scrolling/overscroll.

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 8664769f725181ca5151136e38297568d8c73a84..941cd61e121dee239db932de37e1bc41e9f43d4e 100644
--- a/chrome/test/data/webui/settings/cr_settings_browsertest.js
+++ b/chrome/test/data/webui/settings/cr_settings_browsertest.js
@@ -770,9 +770,11 @@ TEST_F('CrSettingsRouteDynamicParametersTest', 'MAYBE_All', function() {
 
 // Times out on Windows Tests (dbg). See https://crbug.com/651296.
 GEN('#if defined(OS_WIN)');
-GEN('#define MAYBE_MainPage_All DISABLED_All');
+GEN('#define MAYBE_Main_Navigation DISABLED_Navigation');
+GEN('#define MAYBE_Main_Search DISABLED_Search');
 GEN('#else');
-GEN('#define MAYBE_MainPage_All All');
+GEN('#define MAYBE_Main_Navigation Navigation');
+GEN('#define MAYBE_Main_Search Search');
 GEN('#endif');
 
 /**
@@ -780,9 +782,9 @@ GEN('#endif');
  * @constructor
  * @extends {CrSettingsBrowserTest}
 */
-function CrSettingsMainPageTest() {}
+function CrSettingsMainTest() {}
 
-CrSettingsMainPageTest.prototype = {
+CrSettingsMainTest.prototype = {
   __proto__: CrSettingsBrowserTest.prototype,
 
   /** @override */
@@ -790,12 +792,18 @@ CrSettingsMainPageTest.prototype = {
 
   /** @override */
   extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
-    'settings_main_test.js',
+    'settings_main_navigation_test.js',
+    'settings_main_search_test.js',
   ]),
 };
 
-TEST_F('CrSettingsMainPageTest', 'MAYBE_MainPage_All', function() {
-  settings_main_page.registerTests();
+TEST_F('CrSettingsMainTest', 'MAYBE_Main_Navigation', function() {
+  settings_main_navigation_test.registerTests();
+  mocha.run();
+});
+
+TEST_F('CrSettingsMainTest', 'MAYBE_Main_Search', function() {
+  settings_main_search_test.registerTests();
   mocha.run();
 });