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/strings/string16.h" | 5 #include "base/strings/string16.h" |
6 #include "base/strings/utf_string_conversions.h" | 6 #include "base/strings/utf_string_conversions.h" |
7 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h" | 7 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h" |
8 #include "chrome/browser/extensions/api/omnibox/omnibox_api_testbase.h" | 8 #include "chrome/browser/extensions/api/omnibox/omnibox_api_testbase.h" |
9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
10 #include "chrome/browser/search_engines/template_url_service_factory.h" | 10 #include "chrome/browser/search_engines/template_url_service_factory.h" |
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
170 AutocompleteController* autocomplete_controller = | 170 AutocompleteController* autocomplete_controller = |
171 GetAutocompleteController(browser()); | 171 GetAutocompleteController(browser()); |
172 omnibox_view->OnBeforePossibleChange(); | 172 omnibox_view->OnBeforePossibleChange(); |
173 omnibox_view->SetUserText(ASCIIToUTF16("keyword command")); | 173 omnibox_view->SetUserText(ASCIIToUTF16("keyword command")); |
174 omnibox_view->OnAfterPossibleChange(true); | 174 omnibox_view->OnAfterPossibleChange(true); |
175 | 175 |
176 autocomplete_controller->Start(AutocompleteInput( | 176 autocomplete_controller->Start(AutocompleteInput( |
177 ASCIIToUTF16("keyword command"), base::string16::npos, std::string(), | 177 ASCIIToUTF16("keyword command"), base::string16::npos, std::string(), |
178 GURL(), OmniboxEventProto::NTP, true, false, true, true, false, | 178 GURL(), OmniboxEventProto::NTP, true, false, true, true, false, |
179 ChromeAutocompleteSchemeClassifier(profile))); | 179 ChromeAutocompleteSchemeClassifier(profile))); |
180 omnibox_view->model()->AcceptInput(CURRENT_TAB, false); | 180 omnibox_view->model()->AcceptInput(WindowOpenDisposition::CURRENT_TAB, false); |
181 WaitForAutocompleteDone(autocomplete_controller); | 181 WaitForAutocompleteDone(autocomplete_controller); |
182 EXPECT_TRUE(autocomplete_controller->done()); | 182 EXPECT_TRUE(autocomplete_controller->done()); |
183 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); | 183 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); |
184 | 184 |
185 omnibox_view->OnBeforePossibleChange(); | 185 omnibox_view->OnBeforePossibleChange(); |
186 omnibox_view->SetUserText(ASCIIToUTF16("keyword newtab")); | 186 omnibox_view->SetUserText(ASCIIToUTF16("keyword newtab")); |
187 omnibox_view->OnAfterPossibleChange(true); | 187 omnibox_view->OnAfterPossibleChange(true); |
188 WaitForAutocompleteDone(autocomplete_controller); | 188 WaitForAutocompleteDone(autocomplete_controller); |
189 EXPECT_TRUE(autocomplete_controller->done()); | 189 EXPECT_TRUE(autocomplete_controller->done()); |
190 | 190 |
191 autocomplete_controller->Start(AutocompleteInput( | 191 autocomplete_controller->Start(AutocompleteInput( |
192 ASCIIToUTF16("keyword newtab"), base::string16::npos, std::string(), | 192 ASCIIToUTF16("keyword newtab"), base::string16::npos, std::string(), |
193 GURL(), OmniboxEventProto::NTP, true, false, true, true, false, | 193 GURL(), OmniboxEventProto::NTP, true, false, true, true, false, |
194 ChromeAutocompleteSchemeClassifier(profile))); | 194 ChromeAutocompleteSchemeClassifier(profile))); |
195 omnibox_view->model()->AcceptInput(NEW_FOREGROUND_TAB, false); | 195 omnibox_view->model()->AcceptInput(WindowOpenDisposition::NEW_FOREGROUND_TAB, |
| 196 false); |
196 WaitForAutocompleteDone(autocomplete_controller); | 197 WaitForAutocompleteDone(autocomplete_controller); |
197 EXPECT_TRUE(autocomplete_controller->done()); | 198 EXPECT_TRUE(autocomplete_controller->done()); |
198 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); | 199 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); |
199 } | 200 } |
200 | 201 |
201 // Tests that we get suggestions from and send input to the incognito context | 202 // Tests that we get suggestions from and send input to the incognito context |
202 // of an incognito split mode extension. | 203 // of an incognito split mode extension. |
203 // http://crbug.com/100927 | 204 // http://crbug.com/100927 |
204 // Test is flaky: http://crbug.com/101219 | 205 // Test is flaky: http://crbug.com/101219 |
205 IN_PROC_BROWSER_TEST_F(OmniboxApiTest, DISABLED_IncognitoSplitMode) { | 206 IN_PROC_BROWSER_TEST_F(OmniboxApiTest, DISABLED_IncognitoSplitMode) { |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
248 { | 249 { |
249 ResultCatcher catcher; | 250 ResultCatcher catcher; |
250 autocomplete_controller->Start(AutocompleteInput( | 251 autocomplete_controller->Start(AutocompleteInput( |
251 ASCIIToUTF16("keyword command incognito"), base::string16::npos, | 252 ASCIIToUTF16("keyword command incognito"), base::string16::npos, |
252 std::string(), GURL(), OmniboxEventProto::NTP, true, false, true, true, | 253 std::string(), GURL(), OmniboxEventProto::NTP, true, false, true, true, |
253 false, ChromeAutocompleteSchemeClassifier(profile))); | 254 false, ChromeAutocompleteSchemeClassifier(profile))); |
254 location_bar->AcceptInput(); | 255 location_bar->AcceptInput(); |
255 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); | 256 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); |
256 } | 257 } |
257 } | 258 } |
OLD | NEW |