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" |
(...skipping 11 matching lines...) Expand all Loading... |
22 #include "content/public/browser/web_contents_observer.h" | 22 #include "content/public/browser/web_contents_observer.h" |
23 | 23 |
24 namespace chrome { | 24 namespace chrome { |
25 | 25 |
26 namespace { | 26 namespace { |
27 | 27 |
28 class BrowserInstantControllerTest : public InstantUnitTestBase { | 28 class BrowserInstantControllerTest : public InstantUnitTestBase { |
29 public: | 29 public: |
30 virtual void SetUp() OVERRIDE { | 30 virtual void SetUp() OVERRIDE { |
31 ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial( | 31 ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial( |
32 "EmbeddedSearch", "Group1 use_cacheable_ntp:1 prefetch_results:1")); | 32 "EmbeddedSearch", "Group1 use_cacheable_ntp:1")); |
33 InstantUnitTestBase::SetUp(); | 33 InstantUnitTestBase::SetUp(); |
34 } | 34 } |
35 | 35 |
36 protected: | 36 protected: |
37 friend class FakeWebContentsObserver; | 37 friend class FakeWebContentsObserver; |
38 }; | 38 }; |
39 | 39 |
40 const struct TabReloadTestCase { | 40 const struct TabReloadTestCase { |
41 const char* description; | 41 const char* description; |
42 const char* start_url; | 42 const char* start_url; |
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
180 | 180 |
181 browser.reset(NULL); | 181 browser.reset(NULL); |
182 window.reset(NULL); | 182 window.reset(NULL); |
183 EXPECT_FALSE(IsInstantServiceObserver(bic)) | 183 EXPECT_FALSE(IsInstantServiceObserver(bic)) |
184 << "New BrowserInstantController should register as InstantServiceObserver"; | 184 << "New BrowserInstantController should register as InstantServiceObserver"; |
185 } | 185 } |
186 | 186 |
187 } // namespace | 187 } // namespace |
188 | 188 |
189 } // namespace chrome | 189 } // namespace chrome |
OLD | NEW |