| Index: chrome/test/data/webui/settings/basic_page_browsertest.js
|
| diff --git a/chrome/test/data/webui/settings/basic_page_browsertest.js b/chrome/test/data/webui/settings/basic_page_browsertest.js
|
| index fcf5a389d96842b68158e80690a01e7c407ba2d5..609c5ca1b49dbf42775decb7e994d6a6e4798d9f 100644
|
| --- a/chrome/test/data/webui/settings/basic_page_browsertest.js
|
| +++ b/chrome/test/data/webui/settings/basic_page_browsertest.js
|
| @@ -21,16 +21,8 @@ SettingsBasicPageBrowserTest.prototype = {
|
| ]),
|
| };
|
|
|
| -// Times out on debug builders because the Settings page can take several
|
| -// seconds to load in a Release build and several times that in a Debug build.
|
| -// See https://crbug.com/558434.
|
| -GEN('#if !defined(NDEBUG)');
|
| -GEN('#define MAYBE_Load DISABLED_Load');
|
| -GEN('#else');
|
| -GEN('#define MAYBE_Load Load');
|
| -GEN('#endif');
|
| -
|
| -TEST_F('SettingsBasicPageBrowserTest', 'MAYBE_Load', function() {
|
| +// http://crbug/738146
|
| +TEST_F('SettingsBasicPageBrowserTest', 'DISABLED_Load', function() {
|
| // Assign |self| to |this| instead of binding since 'this' in suite()
|
| // and test() will be a Mocha 'Suite' or 'Test' instance.
|
| var self = this;
|
|
|