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 "chrome/browser/ui/toolbar/toolbar_model.h" | 5 #include "chrome/browser/ui/toolbar/toolbar_model.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
11 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" | 11 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" |
12 #include "chrome/browser/instant/instant_service.h" | 12 #include "chrome/browser/instant/instant_service.h" |
13 #include "chrome/browser/instant/instant_service_factory.h" | 13 #include "chrome/browser/instant/instant_service_factory.h" |
| 14 #include "chrome/browser/instant/search.h" |
14 #include "chrome/browser/search_engines/template_url.h" | 15 #include "chrome/browser/search_engines/template_url.h" |
15 #include "chrome/browser/search_engines/template_url_service.h" | 16 #include "chrome/browser/search_engines/template_url_service.h" |
16 #include "chrome/browser/search_engines/template_url_service_factory.h" | 17 #include "chrome/browser/search_engines/template_url_service_factory.h" |
17 #include "chrome/browser/ui/browser.h" | 18 #include "chrome/browser/ui/browser.h" |
18 #include "chrome/browser/ui/search/search.h" | |
19 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 19 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
20 #include "chrome/browser/ui/toolbar/toolbar_model.h" | 20 #include "chrome/browser/ui/toolbar/toolbar_model.h" |
21 #include "chrome/common/chrome_switches.h" | 21 #include "chrome/common/chrome_switches.h" |
22 #include "chrome/test/base/browser_with_test_window_test.h" | 22 #include "chrome/test/base/browser_with_test_window_test.h" |
23 #include "content/public/browser/render_process_host.h" | 23 #include "content/public/browser/render_process_host.h" |
24 #include "content/public/browser/web_contents.h" | 24 #include "content/public/browser/web_contents.h" |
25 #include "content/public/common/url_constants.h" | 25 #include "content/public/common/url_constants.h" |
26 #include "net/base/escape.h" | 26 #include "net/base/escape.h" |
27 | 27 |
28 using content::OpenURLParams; | 28 using content::OpenURLParams; |
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
298 "9/11", | 298 "9/11", |
299 "<nomatch/>", | 299 "<nomatch/>", |
300 "ac/dc", | 300 "ac/dc", |
301 "ps/2", | 301 "ps/2", |
302 }; | 302 }; |
303 | 303 |
304 NavigateAndCheckQueries( | 304 NavigateAndCheckQueries( |
305 std::vector<const char*>(&kQueries[0], | 305 std::vector<const char*>(&kQueries[0], |
306 &kQueries[arraysize(kQueries)]), true); | 306 &kQueries[arraysize(kQueries)]), true); |
307 } | 307 } |
OLD | NEW |