Remove search::IsQueryExtractionEnabled

chrome/browser/search/search_unittest.cc

 // Copyright (c) 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 <stddef.h>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram_base.h"
@@ skipping 103 matching lines @@
   std::unique_ptr<base::FieldTrialList> field_trial_list_;
 };
 
 struct SearchTestCase {
   const char* url;
   bool expected_result;
   const char* comment;
 };
 
 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"},
     {"https://foo.com/instant",        false, "No search terms replacement"},
     {"https://foo.com/?strk",          false, "Non-exact path"},
   };
 
   for (size_t i = 0; i < arraysize(kTestCases); ++i) {
     const SearchTestCase& test = kTestCases[i];
     EXPECT_EQ(test.expected_result,
@@ skipping 22 matching lines @@
 
   for (size_t i = 0; i < arraysize(kTestCases); ++i) {
     const SearchTestCase& test = kTestCases[i];
     EXPECT_EQ(test.expected_result,
               ShouldAssignURLToInstantRenderer(GURL(test.url), profile()))
         << test.url << " " << test.comment;
   }
 }
 
 TEST_F(SearchTest, ShouldUseProcessPerSiteForInstantURL) {
-  EnableQueryExtractionForTesting();
-
   const SearchTestCase kTestCases[] = {
     {"chrome-search://local-ntp",      true,  "Local NTP"},
     {"chrome-search://remote-ntp",     true,  "Remote NTP"},
     {"invalid-scheme://local-ntp",     false, "Invalid Local NTP URL"},
     {"invalid-scheme://online-ntp",    false, "Invalid Online NTP URL"},
     {"chrome-search://foo.com",        false, "Search result page"},
     {"https://foo.com/instant?strk",   false,  ""},
     {"https://foo.com/instant#strk",   false,  ""},
     {"https://foo.com/instant?strk=0", false,  ""},
     {"https://foo.com/url?strk",       false,  ""},
@@ skipping 22 matching lines @@
 const struct ProcessIsolationTestCase {
   const char* description;
   const char* start_url;
   bool start_in_instant_process;
   const char* end_url;
   bool end_in_instant_process;
   bool same_site_instance;
 } 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"));
     const content::WebContents* contents =
         browser()->tab_strip_model()->GetActiveWebContents();
 
     // Navigate to start URL.
     NavigateAndCommitActiveTab(GURL(test.start_url));
     EXPECT_EQ(test.start_in_instant_process, InInstantProcess(contents))
         << test.description;
@@ skipping 17 matching lines @@
     EXPECT_EQ(test.same_site_instance,
               start_rvh == contents->GetRenderViewHost())
         << test.description;
     EXPECT_EQ(test.same_site_instance,
               start_rph == contents->GetRenderProcessHost())
         << test.description;
   }
 }
 
 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"));
     content::WebContents* contents =
         browser()->tab_strip_model()->GetActiveWebContents();
 
     // Navigate to start URL.
     NavigateAndCommitActiveTab(GURL(test.start_url));
     EXPECT_EQ(test.start_in_instant_process, InInstantProcess(contents))
         << test.description;
@@ skipping 45 matching lines @@
   {"https://foo.com/instant",              false, "No search term replacement"},
   {"chrome://blank/",                      false, "Chrome scheme"},
   {"chrome-search://foo",                  false, "Chrome-search scheme"},
   {"https://bar.com/instant?strk=1",       false, "Random non-search page"},
   {chrome::kChromeSearchLocalNtpUrl,       true,  "Local new tab page"},
   {"https://foo.com/newtab?strk",          true,  "New tab URL"},
   {"http://foo.com/newtab?strk",           false, "Insecure New tab URL"},
 };
 
 TEST_F(SearchTest, InstantNTPExtendedEnabled) {
-  EnableQueryExtractionForTesting();
   AddTab(browser(), GURL("chrome://blank"));
   for (size_t i = 0; i < arraysize(kInstantNTPTestCases); ++i) {
     const SearchTestCase& test = kInstantNTPTestCases[i];
     NavigateAndCommitActiveTab(GURL(test.url));
     const content::WebContents* contents =
         browser()->tab_strip_model()->GetWebContentsAt(0);
     EXPECT_EQ(test.expected_result, IsInstantNTP(contents))
         << test.url << " " << test.comment;
   }
 }
 
 TEST_F(SearchTest, InstantNTPCustomNavigationEntry) {
-  EnableQueryExtractionForTesting();
   AddTab(browser(), GURL("chrome://blank"));
   for (size_t i = 0; i < arraysize(kInstantNTPTestCases); ++i) {
     const SearchTestCase& test = kInstantNTPTestCases[i];
     NavigateAndCommitActiveTab(GURL(test.url));
     content::WebContents* contents =
         browser()->tab_strip_model()->GetWebContentsAt(0);
     content::NavigationController& controller = contents->GetController();
     controller.SetTransientEntry(
         controller.CreateNavigationEntry(GURL("chrome://blank"),
                                          content::Referrer(),
@@ skipping 207 matching lines @@
 }
 
 
 TEST_F(SearchTest, IsNTPURL) {
   GURL invalid_url;
   GURL ntp_url(chrome::kChromeUINewTabURL);
   GURL local_ntp_url(chrome::kChromeSearchLocalNtpUrl);
 
   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");
   GURL search_url_without_search_terms("https://foo.com/url?strk&bar");
 
   EXPECT_FALSE(IsNTPURL(ntp_url, profile()));
   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));
   EXPECT_FALSE(IsNTPURL(remote_ntp_url, NULL));
   EXPECT_FALSE(IsNTPURL(search_url_with_search_terms, NULL));
   EXPECT_FALSE(IsNTPURL(search_url_without_search_terms, NULL));
 }
 
 TEST_F(SearchTest, GetSearchURLs) {
   std::vector<GURL> search_urls = GetSearchURLs(profile());
@@ skipping 103 matching lines @@
     data.search_terms_replacement_key = "espv";
     template_url_ = new TemplateURL(data);
     // |template_url_service| takes ownership of |template_url_|.
     template_url_service->Add(template_url_);
     template_url_service->SetUserSelectedDefaultSearchProvider(template_url_);
   }
 
   TemplateURL* template_url_;
 };
 
-TEST_F(SearchURLTest, QueryExtractionEnabled) {
+TEST_F(SearchURLTest, QueryExtractionDisabled) {
   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())));
   ASSERT_TRUE(result.is_valid());
   // Query extraction is disabled. Make sure
   // {google:instantExtendedEnabledParameter} is not set in the search URL.
   EXPECT_EQ("http://www.google.com/search?q=foo", result.spec());
 }
 
 }  // namespace search