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 #include "base/format_macros.h" | 5 #include "base/format_macros.h" |
6 #include "base/string_util.h" | 6 #include "base/string_util.h" |
7 #include "base/stringprintf.h" | 7 #include "base/stringprintf.h" |
8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
9 #include "chrome/browser/autocomplete/autocomplete.h" | 9 #include "chrome/browser/autocomplete/autocomplete.h" |
10 #include "chrome/browser/autocomplete/autocomplete_edit.h" | 10 #include "chrome/browser/autocomplete/autocomplete_edit.h" |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
71 void WaitForAutocompleteDone(AutocompleteController* controller) { | 71 void WaitForAutocompleteDone(AutocompleteController* controller) { |
72 while (!controller->done()) { | 72 while (!controller->done()) { |
73 ui_test_utils::WindowedNotificationObserver ready_observer( | 73 ui_test_utils::WindowedNotificationObserver ready_observer( |
74 chrome::NOTIFICATION_AUTOCOMPLETE_CONTROLLER_RESULT_READY, | 74 chrome::NOTIFICATION_AUTOCOMPLETE_CONTROLLER_RESULT_READY, |
75 content::Source<AutocompleteController>(controller)); | 75 content::Source<AutocompleteController>(controller)); |
76 ready_observer.Wait(); | 76 ready_observer.Wait(); |
77 } | 77 } |
78 } | 78 } |
79 }; | 79 }; |
80 | 80 |
81 IN_PROC_BROWSER_TEST_F(OmniboxApiTest, FLAKY_Basic) { | 81 IN_PROC_BROWSER_TEST_F(OmniboxApiTest, DISABLED_Basic) { |
82 ASSERT_TRUE(RunExtensionTest("omnibox")) << message_; | 82 ASSERT_TRUE(RunExtensionTest("omnibox")) << message_; |
83 | 83 |
84 // The results depend on the TemplateURLService being loaded. Make sure it is | 84 // The results depend on the TemplateURLService being loaded. Make sure it is |
85 // loaded so that the autocomplete results are consistent. | 85 // loaded so that the autocomplete results are consistent. |
86 WaitForTemplateURLServiceToLoad(); | 86 WaitForTemplateURLServiceToLoad(); |
87 | 87 |
88 LocationBar* location_bar = GetLocationBar(browser()); | 88 LocationBar* location_bar = GetLocationBar(browser()); |
89 AutocompleteController* autocomplete_controller = | 89 AutocompleteController* autocomplete_controller = |
90 GetAutocompleteController(browser()); | 90 GetAutocompleteController(browser()); |
91 | 91 |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
185 location_bar->AcceptInput(); | 185 location_bar->AcceptInput(); |
186 // This checks that the keyword provider (via javascript) | 186 // This checks that the keyword provider (via javascript) |
187 // gets told to navigate to the string "command". | 187 // gets told to navigate to the string "command". |
188 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); | 188 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); |
189 } | 189 } |
190 } | 190 } |
191 | 191 |
192 // Tests that the autocomplete popup doesn't reopen after accepting input for | 192 // Tests that the autocomplete popup doesn't reopen after accepting input for |
193 // a given query. | 193 // a given query. |
194 // http://crbug.com/88552 | 194 // http://crbug.com/88552 |
195 IN_PROC_BROWSER_TEST_F(OmniboxApiTest, FLAKY_PopupStaysClosed) { | 195 IN_PROC_BROWSER_TEST_F(OmniboxApiTest, DISABLED_PopupStaysClosed) { |
196 ASSERT_TRUE(RunExtensionTest("omnibox")) << message_; | 196 ASSERT_TRUE(RunExtensionTest("omnibox")) << message_; |
197 | 197 |
198 // The results depend on the TemplateURLService being loaded. Make sure it is | 198 // The results depend on the TemplateURLService being loaded. Make sure it is |
199 // loaded so that the autocomplete results are consistent. | 199 // loaded so that the autocomplete results are consistent. |
200 WaitForTemplateURLServiceToLoad(); | 200 WaitForTemplateURLServiceToLoad(); |
201 | 201 |
202 LocationBar* location_bar = GetLocationBar(browser()); | 202 LocationBar* location_bar = GetLocationBar(browser()); |
203 AutocompleteController* autocomplete_controller = | 203 AutocompleteController* autocomplete_controller = |
204 GetAutocompleteController(browser()); | 204 GetAutocompleteController(browser()); |
205 AutocompletePopupModel* popup_model = | 205 AutocompletePopupModel* popup_model = |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
280 // incognito context. | 280 // incognito context. |
281 { | 281 { |
282 ResultCatcher catcher; | 282 ResultCatcher catcher; |
283 autocomplete_controller->Start( | 283 autocomplete_controller->Start( |
284 ASCIIToUTF16("keyword command incognito"), string16(), | 284 ASCIIToUTF16("keyword command incognito"), string16(), |
285 true, false, true, AutocompleteInput::ALL_MATCHES); | 285 true, false, true, AutocompleteInput::ALL_MATCHES); |
286 location_bar->AcceptInput(); | 286 location_bar->AcceptInput(); |
287 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); | 287 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); |
288 } | 288 } |
289 } | 289 } |
OLD | NEW |