OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 GEN_INCLUDE(['options_browsertest_base.js']); | 5 GEN_INCLUDE(['options_browsertest_base.js']); |
6 | 6 |
7 /** | 7 /** |
8 * TestFixture for browser options WebUI testing. | 8 * TestFixture for browser options WebUI testing. |
9 * @extends {testing.Test} | 9 * @extends {testing.Test} |
10 * @constructor | 10 * @constructor |
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
111 function AdvancedSettingsWebUITest() {} | 111 function AdvancedSettingsWebUITest() {} |
112 | 112 |
113 AdvancedSettingsWebUITest.prototype = { | 113 AdvancedSettingsWebUITest.prototype = { |
114 __proto__: OptionsBrowsertestBase.prototype, | 114 __proto__: OptionsBrowsertestBase.prototype, |
115 | 115 |
116 /** @override */ | 116 /** @override */ |
117 browsePreload: 'chrome://settings-frame/autofill', | 117 browsePreload: 'chrome://settings-frame/autofill', |
118 }; | 118 }; |
119 | 119 |
120 // TODO(crbug.com/617066) Flakes on Win. | 120 // TODO(crbug.com/617066) Flakes on Win. |
121 GEN('#if defined(OS_WIN)'); | 121 // TODO(crbug.com/657514) Flakes on linux and chromeos too. |
| 122 GEN('#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS)'); |
122 GEN('#define MAYBE_testAdvancedSettingsShown ' + | 123 GEN('#define MAYBE_testAdvancedSettingsShown ' + |
123 'DISABLED_testAdvancedSettingsShown'); | 124 'DISABLED_testAdvancedSettingsShown'); |
124 GEN('#else'); | 125 GEN('#else'); |
125 GEN('#define MAYBE_testAdvancedSettingsShown testAdvancedSettingsShown'); | 126 GEN('#define MAYBE_testAdvancedSettingsShown testAdvancedSettingsShown'); |
126 GEN('#endif'); | 127 GEN('#endif'); |
127 TEST_F('AdvancedSettingsWebUITest', 'MAYBE_testAdvancedSettingsShown', | 128 TEST_F('AdvancedSettingsWebUITest', 'MAYBE_testAdvancedSettingsShown', |
128 function() { | 129 function() { |
129 assertEquals(this.browsePreload, document.location.href); | 130 assertEquals(this.browsePreload, document.location.href); |
130 expectFalse($('advanced-settings').hidden); | 131 expectFalse($('advanced-settings').hidden); |
131 }); | 132 }); |
OLD | NEW |