| 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/gtest_prod_util.h" |
| 8 #include "base/memory/scoped_vector.h" | 9 #include "base/memory/scoped_vector.h" |
| 9 #include "base/metrics/field_trial.h" | 10 #include "base/metrics/field_trial.h" |
| 10 #include "chrome/browser/chrome_notification_types.h" | 11 #include "chrome/browser/chrome_notification_types.h" |
| 11 #include "chrome/browser/search/instant_service.h" | 12 #include "chrome/browser/search/instant_service.h" |
| 12 #include "chrome/browser/search/instant_service_observer.h" | 13 #include "chrome/browser/search/instant_service_observer.h" |
| 13 #include "chrome/browser/search/instant_unittest_base.h" | 14 #include "chrome/browser/search/instant_unittest_base.h" |
| 14 #include "chrome/browser/search/search.h" | 15 #include "chrome/browser/search/search.h" |
| 15 #include "chrome/browser/ui/browser_instant_controller.h" | 16 #include "chrome/browser/ui/browser_instant_controller.h" |
| 16 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 17 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 17 #include "chrome/common/url_constants.h" | 18 #include "chrome/common/url_constants.h" |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 214 | 215 |
| 215 browser.reset(NULL); | 216 browser.reset(NULL); |
| 216 window.reset(NULL); | 217 window.reset(NULL); |
| 217 EXPECT_FALSE(IsInstantServiceObserver(bic)) | 218 EXPECT_FALSE(IsInstantServiceObserver(bic)) |
| 218 << "New BrowserInstantController should register as InstantServiceObserver"; | 219 << "New BrowserInstantController should register as InstantServiceObserver"; |
| 219 } | 220 } |
| 220 | 221 |
| 221 } // namespace | 222 } // namespace |
| 222 | 223 |
| 223 } // namespace chrome | 224 } // namespace chrome |
| OLD | NEW |