Remove search::ShouldPrefetchSearchResultsOnSRP

chrome/browser/ui/search/instant_extended_interactive_uitest.cc

Index: chrome/browser/ui/search/instant_extended_interactive_uitest.cc
diff --git a/chrome/browser/ui/search/instant_extended_interactive_uitest.cc b/chrome/browser/ui/search/instant_extended_interactive_uitest.cc
index 0f7fae73a60dd4d52ef91e218cbe5748828f087c..c104a8da8915e0cd848ef8dd908f3a6ce8583b29 100644
--- a/chrome/browser/ui/search/instant_extended_interactive_uitest.cc
+++ b/chrome/browser/ui/search/instant_extended_interactive_uitest.cc
@@ -266,12 +266,6 @@ class InstantExtendedPrefetchTest : public InstantExtendedTest {
     InstantTestBase::Init(instant_url, ntp_url, true);
   }
 
-  void SetUpCommandLine(base::CommandLine* command_line) override {
-    command_line->AppendSwitchASCII(
-        switches::kForceFieldTrials,
-        "EmbeddedSearch/Group11 prefetch_results_srp:1/");
-  }
-
   net::FakeURLFetcherFactory* fake_factory() { return fake_factory_.get(); }
 
  private:
@@ -284,29 +278,6 @@ class InstantExtendedPrefetchTest : public InstantExtendedTest {
   DISALLOW_COPY_AND_ASSIGN(InstantExtendedPrefetchTest);
 };
 
-class InstantExtendedNetworkTest : public InstantExtendedTest {

[Marc Treib, 2016/07/13 12:27:38]

Unrelated, but this class isn't used anywhere.

- protected:
-  void SetUpOnMainThread() override {
-    disable_for_test_.reset(new net::NetworkChangeNotifier::DisableForTest);
-    fake_network_change_notifier_.reset(new FakeNetworkChangeNotifier);
-    InstantExtendedTest::SetUpOnMainThread();
-  }
-
-  void TearDownOnMainThread() override {
-    InstantExtendedTest::TearDownOnMainThread();
-    fake_network_change_notifier_.reset();
-    disable_for_test_.reset();
-  }
-
-  void SetConnectionType(net::NetworkChangeNotifier::ConnectionType type) {
-    fake_network_change_notifier_->SetConnectionType(type);
-  }
-
- private:
-  std::unique_ptr<net::NetworkChangeNotifier::DisableForTest> disable_for_test_;
-  std::unique_ptr<FakeNetworkChangeNotifier> fake_network_change_notifier_;
-};
-
 // Test class used to verify chrome-search: scheme and access policy from the
 // Instant overlay.  This is a subclass of |ExtensionBrowserTest| because it
 // loads a theme that provides a background image.