OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #include <stdio.h> | 5 #include <stdio.h> |
6 | 6 |
7 #include "base/message_loop.h" | 7 #include "base/message_loop.h" |
8 #include "base/string16.h" | 8 #include "base/string16.h" |
9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
10 #include "base/time.h" | 10 #include "base/time.h" |
(...skipping 1104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1115 // Inline autocomplete should still be there. | 1115 // Inline autocomplete should still be there. |
1116 EXPECT_EQ(old_text, omnibox_view->GetText()); | 1116 EXPECT_EQ(old_text, omnibox_view->GetText()); |
1117 } | 1117 } |
1118 | 1118 |
1119 }; | 1119 }; |
1120 | 1120 |
1121 // Test if ctrl-* accelerators are workable in omnibox. | 1121 // Test if ctrl-* accelerators are workable in omnibox. |
1122 // See http://crbug.com/19193: omnibox blocks ctrl-* commands | 1122 // See http://crbug.com/19193: omnibox blocks ctrl-* commands |
1123 // | 1123 // |
1124 // Flaky on interactive tests (dbg), http://crbug.com/69433 | 1124 // Flaky on interactive tests (dbg), http://crbug.com/69433 |
1125 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, FLAKY_BrowserAccelerators) { | 1125 // Disabled on OSX interactive ui tests 10.6, http://crbug.com/92563 |
| 1126 #if defined(OS_MACOSX) |
| 1127 #define MAYBE_BrowserAccelerators DISABLED_BrowserAccelerators |
| 1128 #else |
| 1129 #define MAYBE_BrowserAccelerators FLAKY_BrowserAccelerators |
| 1130 #endif |
| 1131 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_BrowserAccelerators) { |
1126 BrowserAcceleratorsTest(); | 1132 BrowserAcceleratorsTest(); |
1127 } | 1133 } |
1128 | 1134 |
1129 // Flakily fails and times out on Win only. http://crbug.com/69941 | 1135 // Flakily fails and times out on Win only. http://crbug.com/69941 |
1130 #if defined(OS_WIN) | 1136 #if defined(OS_WIN) |
1131 #define MAYBE_PopupAccelerators DISABLED_PopupAccelerators | 1137 #define MAYBE_PopupAccelerators DISABLED_PopupAccelerators |
1132 #else | 1138 #else |
1133 #define MAYBE_PopupAccelerators PopupAccelerators | 1139 #define MAYBE_PopupAccelerators PopupAccelerators |
1134 #endif | 1140 #endif |
1135 | 1141 |
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1401 PersistKeywordModeOnTabSwitch) { | 1407 PersistKeywordModeOnTabSwitch) { |
1402 PersistKeywordModeOnTabSwitch(); | 1408 PersistKeywordModeOnTabSwitch(); |
1403 } | 1409 } |
1404 | 1410 |
1405 IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, | 1411 IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, |
1406 CtrlKeyPressedWithInlineAutocompleteTest) { | 1412 CtrlKeyPressedWithInlineAutocompleteTest) { |
1407 CtrlKeyPressedWithInlineAutocompleteTest(); | 1413 CtrlKeyPressedWithInlineAutocompleteTest(); |
1408 } | 1414 } |
1409 | 1415 |
1410 #endif | 1416 #endif |
OLD | NEW |