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

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

 // Copyright 2015 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 Runs the Polymer Settings tests. */
 
 /** @const {string} Path to source root. */
 var ROOT_PATH = '../../../../../';
 
 // Polymer BrowserTest fixture.
@@ skipping 752 matching lines @@
         done();
       });
       window.history.back();
     });
   });
   mocha.run();
 });
 
 // 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');
 
 /**
  * Test fixture for chrome/browser/resources/settings/settings_main/.
  * @constructor
  * @extends {CrSettingsBrowserTest}
 */
-function CrSettingsMainPageTest() {}
+function CrSettingsMainTest() {}
 
-CrSettingsMainPageTest.prototype = {
+CrSettingsMainTest.prototype = {
   __proto__: CrSettingsBrowserTest.prototype,
 
   /** @override */
   browsePreload: 'chrome://md-settings/settings_main/settings_main.html',
 
   /** @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();
+});
+
 /**
  * @constructor
  * @extends {CrSettingsBrowserTest}
  */
 function CrControlledButtonTest() {}
 
 CrControlledButtonTest.prototype = {
   __proto__: CrSettingsBrowserTest.prototype,
 
   /** @override */
@@ skipping 44 matching lines @@
     'test_privacy_page_browser_proxy.js',
     'metrics_reporting_tests.js',
   ]),
 };
 
 TEST_F('CrSettingsMetricsReportingTest', 'All', function() {
   mocha.run();
 });
 
 GEN('#endif');