Remove search::ShouldPrefetchSearchResultsOnSRP

chrome/browser/ui/search/instant_extended_interactive_uitest.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 <stdint.h>
 
 #include <sstream>
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
@@ skipping 248 matching lines @@
   void SetUpInProcessBrowserTestFixture() override {
     search::EnableQueryExtractionForTesting();
     ASSERT_TRUE(https_test_server().Start());
     GURL instant_url =
         https_test_server().GetURL("/instant_extended.html?strk=1&");
     GURL ntp_url =
         https_test_server().GetURL("/instant_extended_ntp.html?strk=1&");
     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:
   // Used to instantiate FakeURLFetcherFactory.
   std::unique_ptr<net::URLFetcherImplFactory> factory_;
 
   // Used to mock default search provider suggest response.
   std::unique_ptr<net::FakeURLFetcherFactory> fake_factory_;
 
   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.
 class InstantPolicyTest : public ExtensionBrowserTest, public InstantTestBase {
  public:
   InstantPolicyTest() {}
 
  protected:
   void SetUpInProcessBrowserTestFixture() override {
     ASSERT_TRUE(https_test_server().Start());
@@ skipping 650 matching lines @@
   stream << "link.href = \"" << result_url.spec() << "\";";
   stream << "document.body.appendChild(link);";
   stream << "link.click();";
   EXPECT_TRUE(content::ExecuteScript(contents, stream.str()));
 
   content::WaitForLoadStop(contents);
   std::string expected_title =
       "Referrer is " + instant_url().GetWithEmptyPath().spec();
   EXPECT_EQ(ASCIIToUTF16(expected_title), contents->GetTitle());
 }