Remove search::IsQueryExtractionEnabled

chrome/browser/search/search_unittest.cc

Index: chrome/browser/search/search_unittest.cc
diff --git a/chrome/browser/search/search_unittest.cc b/chrome/browser/search/search_unittest.cc
index 00857207e139775863bbea1cd2afa872781cd2f8..3df1685b6867d720917ca5d4f4bc79730ded09c0 100644
--- a/chrome/browser/search/search_unittest.cc
+++ b/chrome/browser/search/search_unittest.cc
@@ -121,15 +121,13 @@ struct SearchTestCase {
 };
 
 TEST_F(SearchTest, ShouldAssignURLToInstantRendererExtendedEnabled) {
-  EnableQueryExtractionForTesting();
-
   const SearchTestCase kTestCases[] = {
     {chrome::kChromeSearchLocalNtpUrl, true,  ""},
     {"https://foo.com/instant?strk",   true,  ""},
     {"https://foo.com/instant#strk",   true,  ""},
     {"https://foo.com/instant?strk=0", true,  ""},
-    {"https://foo.com/url?strk",       true,  ""},
-    {"https://foo.com/alt?strk",       true,  ""},
+    {"https://foo.com/url?strk",       false, ""},
+    {"https://foo.com/alt?strk",       false, ""},
     {"http://foo.com/instant",         false, "Non-HTTPS"},
     {"http://foo.com/instant?strk",    false, "Non-HTTPS"},
     {"http://foo.com/instant?strk=1",  false, "Non-HTTPS"},
@@ -172,8 +170,6 @@ TEST_F(SearchTest, ShouldAssignURLToInstantRendererExtendedEnabledNotOnSRP) {
 }
 
 TEST_F(SearchTest, ShouldUseProcessPerSiteForInstantURL) {
-  EnableQueryExtractionForTesting();
-
   const SearchTestCase kTestCases[] = {
     {"chrome-search://local-ntp",      true,  "Local NTP"},
     {"chrome-search://remote-ntp",     true,  "Remote NTP"},
@@ -216,30 +212,28 @@ const struct ProcessIsolationTestCase {
 } kProcessIsolationTestCases[] = {
   {"Local NTP -> SRP",
    "chrome-search://local-ntp",       true,
-   "https://foo.com/url?strk",        true,   false },
+   "https://foo.com/url?strk",        false,  false },
   {"Local NTP -> Regular",
    "chrome-search://local-ntp",       true,
    "https://foo.com/other",           false,  false },
   {"Remote NTP -> SRP",
    "https://foo.com/newtab?strk",     true,
-   "https://foo.com/url?strk",        true,   false },
+   "https://foo.com/url?strk",        false,  false },
   {"Remote NTP -> Regular",
    "https://foo.com/newtab?strk",     true,
    "https://foo.com/other",           false,  false },
   {"SRP -> SRP",
-   "https://foo.com/url?strk",        true,
-   "https://foo.com/url?strk",        true,   true  },
+   "https://foo.com/url?strk",        false,
+   "https://foo.com/url?strk",        false,  true  },
   {"SRP -> Regular",
-   "https://foo.com/url?strk",        true,
-   "https://foo.com/other",           false,  false },
+   "https://foo.com/url?strk",        false,
+   "https://foo.com/other",           false,  true },
   {"Regular -> SRP",
    "https://foo.com/other",           false,
-   "https://foo.com/url?strk",        true,   false },
+   "https://foo.com/url?strk",        false,  true },
 };
 
 TEST_F(SearchTest, ProcessIsolation) {
-  EnableQueryExtractionForTesting();
-
   for (size_t i = 0; i < arraysize(kProcessIsolationTestCases); ++i) {
     const ProcessIsolationTestCase& test = kProcessIsolationTestCases[i];
     AddTab(browser(), GURL("chrome://blank"));
@@ -277,8 +271,6 @@ TEST_F(SearchTest, ProcessIsolation) {
 }
 
 TEST_F(SearchTest, ProcessIsolation_RendererInitiated) {
-  EnableQueryExtractionForTesting();
-
   for (size_t i = 0; i < arraysize(kProcessIsolationTestCases); ++i) {
     const ProcessIsolationTestCase& test = kProcessIsolationTestCases[i];
     AddTab(browser(), GURL("chrome://blank"));
@@ -344,7 +336,6 @@ const SearchTestCase kInstantNTPTestCases[] = {
 };
 
 TEST_F(SearchTest, InstantNTPExtendedEnabled) {
-  EnableQueryExtractionForTesting();
   AddTab(browser(), GURL("chrome://blank"));
   for (size_t i = 0; i < arraysize(kInstantNTPTestCases); ++i) {
     const SearchTestCase& test = kInstantNTPTestCases[i];
@@ -357,7 +348,6 @@ TEST_F(SearchTest, InstantNTPExtendedEnabled) {
 }
 
 TEST_F(SearchTest, InstantNTPCustomNavigationEntry) {
-  EnableQueryExtractionForTesting();
   AddTab(browser(), GURL("chrome://blank"));
   for (size_t i = 0; i < arraysize(kInstantNTPTestCases); ++i) {
     const SearchTestCase& test = kInstantNTPTestCases[i];
@@ -585,7 +575,6 @@ TEST_F(SearchTest, IsNTPURL) {
 
   EXPECT_FALSE(IsNTPURL(invalid_url, profile()));
   // No margin.
-  EnableQueryExtractionForTesting();
   profile()->GetPrefs()->SetBoolean(prefs::kSearchSuggestEnabled, true);
   GURL remote_ntp_url(GetInstantURL(profile(), false));
   GURL search_url_with_search_terms("https://foo.com/url?strk&bar=abc");
@@ -595,7 +584,7 @@ TEST_F(SearchTest, IsNTPURL) {
   EXPECT_TRUE(IsNTPURL(local_ntp_url, profile()));
   EXPECT_TRUE(IsNTPURL(remote_ntp_url, profile()));
   EXPECT_FALSE(IsNTPURL(search_url_with_search_terms, profile()));
-  EXPECT_TRUE(IsNTPURL(search_url_without_search_terms, profile()));
+  EXPECT_FALSE(IsNTPURL(search_url_without_search_terms, profile()));
 
   EXPECT_FALSE(IsNTPURL(ntp_url, NULL));
   EXPECT_FALSE(IsNTPURL(local_ntp_url, NULL));
@@ -719,22 +708,8 @@ class SearchURLTest : public SearchTest {
   TemplateURL* template_url_;
 };
 
-TEST_F(SearchURLTest, QueryExtractionEnabled) {
-  UIThreadSearchTermsData::SetGoogleBaseURL("http://www.google.com/");
-  EnableQueryExtractionForTesting();
-  EXPECT_TRUE(IsQueryExtractionEnabled());
-  TemplateURLRef::SearchTermsArgs search_terms_args(base::ASCIIToUTF16("foo"));
-  GURL result(template_url_->url_ref().ReplaceSearchTerms(
-      search_terms_args, UIThreadSearchTermsData(profile())));
-  ASSERT_TRUE(result.is_valid());
-  // Query extraction is enabled. Make sure
-  // {google:instantExtendedEnabledParameter} is set in the search URL.
-  EXPECT_EQ("http://www.google.com/search?espv=2&q=foo", result.spec());
-}
-
 TEST_F(SearchURLTest, QueryExtractionDisabled) {
   UIThreadSearchTermsData::SetGoogleBaseURL("http://www.google.com/");
-  EXPECT_FALSE(IsQueryExtractionEnabled());
   TemplateURLRef::SearchTermsArgs search_terms_args(base::ASCIIToUTF16("foo"));
   GURL result(template_url_->url_ref().ReplaceSearchTerms(
       search_terms_args, UIThreadSearchTermsData(profile())));