| 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 /** | 5 /** |
| 6 * TestFixture for browser options WebUI testing. | 6 * TestFixture for browser options WebUI testing. |
| 7 * @extends {testing.Test} | 7 * @extends {testing.Test} |
| 8 * @constructor | 8 * @constructor |
| 9 **/ | 9 **/ |
| 10 function BrowserOptionsWebUITest() {} | 10 function BrowserOptionsWebUITest() {} |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 // Times out on Mac debug only. See http://crbug.com/121030 | 22 // Times out on Mac debug only. See http://crbug.com/121030 |
| 23 GEN('#if defined(OS_MACOSX) && !defined(NDEBUG)'); | 23 GEN('#if defined(OS_MACOSX) && !defined(NDEBUG)'); |
| 24 GEN('#define MAYBE_testOpenBrowserOptions ' + | 24 GEN('#define MAYBE_testOpenBrowserOptions ' + |
| 25 'DISABLED_testOpenBrowserOptions'); | 25 'DISABLED_testOpenBrowserOptions'); |
| 26 GEN('#else'); | 26 GEN('#else'); |
| 27 GEN('#define MAYBE_testOpenBrowserOptions testOpenBrowserOptions'); | 27 GEN('#define MAYBE_testOpenBrowserOptions testOpenBrowserOptions'); |
| 28 GEN('#endif // defined(OS_MACOSX)'); | 28 GEN('#endif // defined(OS_MACOSX)'); |
| 29 TEST_F('BrowserOptionsWebUITest', 'MAYBE_testOpenBrowserOptions', function() { | 29 TEST_F('BrowserOptionsWebUITest', 'MAYBE_testOpenBrowserOptions', function() { |
| 30 assertEquals(this.browsePreload, document.location.href); | 30 assertEquals(this.browsePreload, document.location.href); |
| 31 }); | 31 }); |
| OLD | NEW |