Test fixes and clean up in preparation for moving DSE to Prefs.

chrome/browser/ui/browser_instant_controller_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_vector.h"
+#include "base/metrics/field_trial.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/instant_service_observer.h"
 #include "chrome/browser/search/instant_unittest_base.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/ui/browser_instant_controller.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 
 namespace chrome {
 
 namespace {
 
 class BrowserInstantControllerTest : public InstantUnitTestBase {
  protected:
   friend class FakeWebContentsObserver;
 };
 
+class BrowserInstantControllerEmbeddedTest : public InstantUnitTestBase {

[Peter Kasting, 2014/05/06 19:49:00]

Why not just do this on BrowserInstantControllerTest?  That's what Erik's and my
changes both do, and I think the GoogleBaseURLUpdated test below is going to
need this anyway.

[Cait (Slow), 2014/05/06 20:10:53]

I tried this and it broke GoogleBaseURLUpdated to have the field trial enabled
-- Perhaps the changes to BrowserInstantController in your CL fix this though?
In that case, I'll let you handle the BrowserInstantController-related test
fixes in your CL.

+ public:
+  virtual void SetUp() OVERRIDE {
+    ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
+        "EmbeddedSearch", "Group1 use_cacheable_ntp:1 prefetch_results:1"));
+    InstantUnitTestBase::SetUp();
+  }
+
+ protected:
+  friend class FakeWebContentsObserver;
+};
+
 const struct TabReloadTestCase {
   const char* description;
   const char* start_url;
   bool start_in_instant_process;
   bool should_reload;
   bool end_in_instant_process;
 } kTabReloadTestCases[] = {
     {"Local Embedded NTP", chrome::kChromeSearchLocalNtpUrl,
      true, true, true},
     {"Remote Embedded NTP", "https://www.google.com/instant?strk",
@@ skipping 33 matching lines @@
                            DefaultSearchProviderChanged);
   FRIEND_TEST_ALL_PREFIXES(BrowserInstantControllerTest,
                            GoogleBaseURLUpdated);
 
  private:
   content::WebContents* contents_;
   const GURL& url_;
   int num_reloads_;
 };
 
-TEST_F(BrowserInstantControllerTest, DefaultSearchProviderChanged) {
+TEST_F(BrowserInstantControllerEmbeddedTest, DefaultSearchProviderChanged) {
   size_t num_tests = arraysize(kTabReloadTestCases);
   ScopedVector<FakeWebContentsObserver> observers;
   for (size_t i = 0; i < num_tests; ++i) {
     const TabReloadTestCase& test = kTabReloadTestCases[i];
     AddTab(browser(), GURL(test.start_url));
     content::WebContents* contents =
       browser()->tab_strip_model()->GetActiveWebContents();
 
     // Validate initial instant state.
     EXPECT_EQ(test.start_in_instant_process,
@@ skipping 76 matching lines @@
 
   browser.reset(NULL);
   window.reset(NULL);
   EXPECT_FALSE(IsInstantServiceObserver(bic))
     << "New BrowserInstantController should register as InstantServiceObserver";
 }
 
 }  // namespace
 
 }  // namespace chrome