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/autocomplete_controller.h" | 7 #include "chrome/browser/autocomplete/autocomplete_controller.h" |
8 #include "chrome/browser/autocomplete/autocomplete_result.h" | 8 #include "chrome/browser/autocomplete/autocomplete_result.h" |
9 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h" | 9 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h" |
10 #include "chrome/browser/extensions/api/omnibox/omnibox_api_testbase.h" | 10 #include "chrome/browser/extensions/api/omnibox/omnibox_api_testbase.h" |
11 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
12 #include "chrome/browser/search_engines/template_url_service_factory.h" | 12 #include "chrome/browser/search_engines/template_url_service_factory.h" |
13 #include "chrome/browser/ui/browser.h" | 13 #include "chrome/browser/ui/browser.h" |
14 #include "chrome/browser/ui/location_bar/location_bar.h" | 14 #include "chrome/browser/ui/location_bar/location_bar.h" |
15 #include "chrome/browser/ui/omnibox/omnibox_view.h" | 15 #include "chrome/browser/ui/omnibox/omnibox_view.h" |
16 #include "chrome/test/base/ui_test_utils.h" | 16 #include "chrome/test/base/ui_test_utils.h" |
17 #include "components/autocomplete/autocomplete_input.h" | |
18 #include "components/autocomplete/autocomplete_match.h" | |
19 #include "components/metrics/proto/omnibox_event.pb.h" | 17 #include "components/metrics/proto/omnibox_event.pb.h" |
| 18 #include "components/omnibox/autocomplete_input.h" |
| 19 #include "components/omnibox/autocomplete_match.h" |
20 #include "ui/base/window_open_disposition.h" | 20 #include "ui/base/window_open_disposition.h" |
21 | 21 |
22 using base::ASCIIToUTF16; | 22 using base::ASCIIToUTF16; |
23 using metrics::OmniboxEventProto; | 23 using metrics::OmniboxEventProto; |
24 | 24 |
25 // http://crbug.com/167158 | 25 // http://crbug.com/167158 |
26 IN_PROC_BROWSER_TEST_F(OmniboxApiTest, DISABLED_Basic) { | 26 IN_PROC_BROWSER_TEST_F(OmniboxApiTest, DISABLED_Basic) { |
27 ASSERT_TRUE(RunExtensionTest("omnibox")) << message_; | 27 ASSERT_TRUE(RunExtensionTest("omnibox")) << message_; |
28 | 28 |
29 // The results depend on the TemplateURLService being loaded. Make sure it is | 29 // The results depend on the TemplateURLService being loaded. Make sure it is |
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
246 { | 246 { |
247 ResultCatcher catcher; | 247 ResultCatcher catcher; |
248 autocomplete_controller->Start(AutocompleteInput( | 248 autocomplete_controller->Start(AutocompleteInput( |
249 ASCIIToUTF16("keyword command incognito"), base::string16::npos, | 249 ASCIIToUTF16("keyword command incognito"), base::string16::npos, |
250 base::string16(), GURL(), OmniboxEventProto::NTP, true, false, true, | 250 base::string16(), GURL(), OmniboxEventProto::NTP, true, false, true, |
251 true, ChromeAutocompleteSchemeClassifier(profile))); | 251 true, ChromeAutocompleteSchemeClassifier(profile))); |
252 location_bar->AcceptInput(); | 252 location_bar->AcceptInput(); |
253 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); | 253 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); |
254 } | 254 } |
255 } | 255 } |
OLD | NEW |