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

chrome/browser/ui/browser_instant_controller_unittest.cc

Index: chrome/browser/ui/browser_instant_controller_unittest.cc
diff --git a/chrome/browser/ui/browser_instant_controller_unittest.cc b/chrome/browser/ui/browser_instant_controller_unittest.cc
index d93ef568efb308b7ddae7d1ecc4d2f0df35a9418..089c8071a617b2b5b6f04109c702fd27d95153a7 100644
--- a/chrome/browser/ui/browser_instant_controller_unittest.cc
+++ b/chrome/browser/ui/browser_instant_controller_unittest.cc
@@ -6,6 +6,7 @@
 
 #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"
@@ -29,6 +30,18 @@ class BrowserInstantControllerTest : public InstantUnitTestBase {
   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;
@@ -82,7 +95,7 @@ class FakeWebContentsObserver : public content::WebContentsObserver {
   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) {