Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(404)

Side by Side Diff: chrome/browser/ui/browser_instant_controller_unittest.cc

Issue 268643002: Use the DefaultSearchManager as the exclusive authority on DSE, ignoring Web Data. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Last test fix? Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 "chrome/browser/chrome_notification_types.h" 10 #include "chrome/browser/chrome_notification_types.h"
10 #include "chrome/browser/search/instant_service.h" 11 #include "chrome/browser/search/instant_service.h"
11 #include "chrome/browser/search/instant_service_observer.h" 12 #include "chrome/browser/search/instant_service_observer.h"
12 #include "chrome/browser/search/instant_unittest_base.h" 13 #include "chrome/browser/search/instant_unittest_base.h"
13 #include "chrome/browser/search/search.h" 14 #include "chrome/browser/search/search.h"
14 #include "chrome/browser/ui/browser_instant_controller.h" 15 #include "chrome/browser/ui/browser_instant_controller.h"
15 #include "chrome/browser/ui/tabs/tab_strip_model.h" 16 #include "chrome/browser/ui/tabs/tab_strip_model.h"
16 #include "chrome/common/pref_names.h" 17 #include "chrome/common/pref_names.h"
17 #include "chrome/common/url_constants.h" 18 #include "chrome/common/url_constants.h"
18 #include "content/public/browser/navigation_controller.h" 19 #include "content/public/browser/navigation_controller.h"
19 #include "content/public/browser/render_process_host.h" 20 #include "content/public/browser/render_process_host.h"
20 #include "content/public/browser/web_contents.h" 21 #include "content/public/browser/web_contents.h"
21 #include "content/public/browser/web_contents_observer.h" 22 #include "content/public/browser/web_contents_observer.h"
22 23
23 namespace chrome { 24 namespace chrome {
24 25
25 namespace { 26 namespace {
26 27
27 class BrowserInstantControllerTest : public InstantUnitTestBase { 28 class BrowserInstantControllerTest : public InstantUnitTestBase {
29 public:
30 virtual void SetUp() OVERRIDE {
31 ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
32 "EmbeddedSearch", "Group1 use_cacheable_ntp:1 prefetch_results:1"));
33 InstantUnitTestBase::SetUp();
34 }
35
28 protected: 36 protected:
29 friend class FakeWebContentsObserver; 37 friend class FakeWebContentsObserver;
30 }; 38 };
31 39
32 const struct TabReloadTestCase { 40 const struct TabReloadTestCase {
33 const char* description; 41 const char* description;
34 const char* start_url; 42 const char* start_url;
35 bool start_in_instant_process; 43 bool start_in_instant_process;
36 bool should_reload; 44 bool should_reload;
37 bool end_in_instant_process; 45 bool end_in_instant_process;
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 180
173 browser.reset(NULL); 181 browser.reset(NULL);
174 window.reset(NULL); 182 window.reset(NULL);
175 EXPECT_FALSE(IsInstantServiceObserver(bic)) 183 EXPECT_FALSE(IsInstantServiceObserver(bic))
176 << "New BrowserInstantController should register as InstantServiceObserver"; 184 << "New BrowserInstantController should register as InstantServiceObserver";
177 } 185 }
178 186
179 } // namespace 187 } // namespace
180 188
181 } // namespace chrome 189 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698