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 #include <string> | 5 #include <string> |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/memory/scoped_vector.h" | 8 #include "base/memory/scoped_vector.h" |
9 #include "base/metrics/field_trial.h" | 9 #include "base/metrics/field_trial.h" |
10 #include "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
11 #include "chrome/browser/search/instant_service.h" | 11 #include "chrome/browser/search/instant_service.h" |
12 #include "chrome/browser/search/instant_service_observer.h" | 12 #include "chrome/browser/search/instant_service_observer.h" |
13 #include "chrome/browser/search/instant_unittest_base.h" | 13 #include "chrome/browser/search/instant_unittest_base.h" |
14 #include "chrome/browser/search/search.h" | 14 #include "chrome/browser/search/search.h" |
15 #include "chrome/browser/ui/browser_instant_controller.h" | 15 #include "chrome/browser/ui/browser_instant_controller.h" |
16 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 16 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
17 #include "chrome/common/pref_names.h" | |
18 #include "chrome/common/url_constants.h" | 17 #include "chrome/common/url_constants.h" |
19 #include "content/public/browser/navigation_controller.h" | 18 #include "content/public/browser/navigation_controller.h" |
20 #include "content/public/browser/render_process_host.h" | 19 #include "content/public/browser/render_process_host.h" |
21 #include "content/public/browser/web_contents.h" | 20 #include "content/public/browser/web_contents.h" |
22 #include "content/public/browser/web_contents_observer.h" | 21 #include "content/public/browser/web_contents_observer.h" |
23 | 22 |
24 namespace chrome { | 23 namespace chrome { |
25 | 24 |
26 namespace { | 25 namespace { |
27 | 26 |
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
180 | 179 |
181 browser.reset(NULL); | 180 browser.reset(NULL); |
182 window.reset(NULL); | 181 window.reset(NULL); |
183 EXPECT_FALSE(IsInstantServiceObserver(bic)) | 182 EXPECT_FALSE(IsInstantServiceObserver(bic)) |
184 << "New BrowserInstantController should register as InstantServiceObserver"; | 183 << "New BrowserInstantController should register as InstantServiceObserver"; |
185 } | 184 } |
186 | 185 |
187 } // namespace | 186 } // namespace |
188 | 187 |
189 } // namespace chrome | 188 } // namespace chrome |
OLD | NEW |