OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #ifndef CHROME_BROWSER_INSTANT_INSTANT_TEST_UTILS_H_ | 5 #ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_TEST_UTILS_H_ |
6 #define CHROME_BROWSER_INSTANT_INSTANT_TEST_UTILS_H_ | 6 #define CHROME_BROWSER_UI_SEARCH_INSTANT_TEST_UTILS_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
11 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
12 #include "base/run_loop.h" | 12 #include "base/run_loop.h" |
13 #include "chrome/browser/instant/instant_controller.h" | |
14 #include "chrome/browser/instant/instant_overlay_model_observer.h" | |
15 #include "chrome/browser/ui/browser.h" | 13 #include "chrome/browser/ui/browser.h" |
16 #include "chrome/browser/ui/browser_instant_controller.h" | 14 #include "chrome/browser/ui/browser_instant_controller.h" |
17 #include "chrome/browser/ui/browser_window.h" | 15 #include "chrome/browser/ui/browser_window.h" |
18 #include "chrome/browser/ui/omnibox/location_bar.h" | 16 #include "chrome/browser/ui/omnibox/location_bar.h" |
| 17 #include "chrome/browser/ui/search/instant_controller.h" |
| 18 #include "chrome/browser/ui/search/instant_overlay_model_observer.h" |
19 #include "chrome/common/search_types.h" | 19 #include "chrome/common/search_types.h" |
20 #include "googleurl/src/gurl.h" | 20 #include "googleurl/src/gurl.h" |
21 #include "net/test/test_server.h" | 21 #include "net/test/test_server.h" |
22 | 22 |
23 class InstantController; | 23 class InstantController; |
24 class InstantModel; | 24 class InstantModel; |
25 class OmniboxView; | 25 class OmniboxView; |
26 | 26 |
27 namespace content { | 27 namespace content { |
28 class WebContents; | 28 class WebContents; |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
115 GURL instant_url_; | 115 GURL instant_url_; |
116 | 116 |
117 Browser* browser_; | 117 Browser* browser_; |
118 | 118 |
119 // HTTPS Testing server, started on demand. | 119 // HTTPS Testing server, started on demand. |
120 net::TestServer https_test_server_; | 120 net::TestServer https_test_server_; |
121 | 121 |
122 DISALLOW_COPY_AND_ASSIGN(InstantTestBase); | 122 DISALLOW_COPY_AND_ASSIGN(InstantTestBase); |
123 }; | 123 }; |
124 | 124 |
125 #endif // CHROME_BROWSER_INSTANT_INSTANT_TEST_UTILS_H_ | 125 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_TEST_UTILS_H_ |
OLD | NEW |