Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(38)

Side by Side Diff: chrome/browser/ui/omnibox/omnibox_view_browsertest.cc

Issue 8915011: OmniboxViewTest.PopupAccelerators had to be disabled for Aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Renased Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1113 matching lines...) Expand 10 before | Expand all | Expand 10 after
1124 1124
1125 // Test if ctrl-* accelerators are workable in omnibox. 1125 // Test if ctrl-* accelerators are workable in omnibox.
1126 // See http://crbug.com/19193: omnibox blocks ctrl-* commands 1126 // See http://crbug.com/19193: omnibox blocks ctrl-* commands
1127 // 1127 //
1128 // Flaky on interactive tests (dbg), http://crbug.com/69433 1128 // Flaky on interactive tests (dbg), http://crbug.com/69433
1129 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, FLAKY_BrowserAccelerators) { 1129 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, FLAKY_BrowserAccelerators) {
1130 BrowserAcceleratorsTest(); 1130 BrowserAcceleratorsTest();
1131 } 1131 }
1132 1132
1133 // Flakily fails and times out on Win only. http://crbug.com/69941 1133 // Flakily fails and times out on Win only. http://crbug.com/69941
1134 #if defined(OS_WIN) 1134 #if defined(OS_WIN) || defined(USE_AURA)
1135 #define MAYBE_PopupAccelerators DISABLED_PopupAccelerators 1135 #define MAYBE_PopupAccelerators DISABLED_PopupAccelerators
1136 #else 1136 #else
1137 #define MAYBE_PopupAccelerators PopupAccelerators 1137 #define MAYBE_PopupAccelerators PopupAccelerators
1138 #endif 1138 #endif
1139 1139
1140 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_PopupAccelerators) { 1140 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_PopupAccelerators) {
1141 PopupAcceleratorsTest(); 1141 PopupAcceleratorsTest();
1142 } 1142 }
1143 1143
1144 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, BackspaceInKeywordMode) { 1144 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, BackspaceInKeywordMode) {
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
1403 PersistKeywordModeOnTabSwitch) { 1403 PersistKeywordModeOnTabSwitch) {
1404 PersistKeywordModeOnTabSwitch(); 1404 PersistKeywordModeOnTabSwitch();
1405 } 1405 }
1406 1406
1407 IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, 1407 IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest,
1408 CtrlKeyPressedWithInlineAutocompleteTest) { 1408 CtrlKeyPressedWithInlineAutocompleteTest) {
1409 CtrlKeyPressedWithInlineAutocompleteTest(); 1409 CtrlKeyPressedWithInlineAutocompleteTest();
1410 } 1410 }
1411 1411
1412 #endif 1412 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698