MD Settings: Fix and re-enable settings-main tests.

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 233 matching lines @@
  * This is ChromeOS only.
  * @constructor
  * @extends {CrSettingsBrowserTest}
  */
 function CrSettingsPeoplePageLockScreenTest() {}
 
 CrSettingsPeoplePageLockScreenTest.prototype = {
   __proto__: CrSettingsBrowserTest.prototype,
 
   /** @override */
-  //browsePreload: 'chrome://md-settings/settings_main/settings_main.html',
   browsePreload: 'chrome://md-settings/people_page/lock_screen.html',
 
   /** @override */
   extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
     '../fake_chrome_event.js',
     'fake_quick_unlock_private.js',
     'fake_settings_private.js',
     'fake_quick_unlock_uma.js',
     'quick_unlock_authenticate_browsertest_chromeos.js'
   ]),
@@ skipping 1119 matching lines @@
         done();
       });
       window.history.back();
     });
   });
   mocha.run();
 });
 
 // Times out on Windows Tests (dbg). See https://crbug.com/651296.
 // Times out / crashes on chromium.linux/Linux Tests (dbg) crbug.com/667882
-GEN('#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_LINUX)' +
-    ' || defined(OS_MACOSX)');
-GEN('#define MAYBE_MainPage_All DISABLED_All');
+GEN('#if !defined(NDEBUG)')
+GEN('#define MAYBE_MainPage_All DISABLED_MainPage_All');
 GEN('#else');
-GEN('#define MAYBE_MainPage_All All');
+GEN('#define MAYBE_MainPage_All MainPage_All');
 GEN('#endif');
 
 /**
  * Test fixture for chrome/browser/resources/settings/settings_main/.
  * @constructor
  * @extends {CrSettingsBrowserTest}
  */
 function CrSettingsMainPageTest() {}
 
 CrSettingsMainPageTest.prototype = {
   __proto__: CrSettingsBrowserTest.prototype,
 
   /** @override */
   browsePreload: 'chrome://md-settings/settings_main/settings_main.html',
 
   /** @override */
   extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
     'test_browser_proxy.js',
+    'test_util.js',
     'settings_main_test.js',
   ]),
 };
 
 TEST_F('CrSettingsMainPageTest', 'MAYBE_MainPage_All', function() {
   settings_main_page.registerTests();
   mocha.run();
 });
 
 /**
@@ skipping 187 matching lines @@
   extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
     'test_browser_proxy.js',
     'test_extension_control_browser_proxy.js',
     'extension_controlled_indicator_tests.js',
   ]),
 };
 
 TEST_F('CrSettingsExtensionControlledIndicatorTest', 'All', function() {
   mocha.run();
 });