Cleanup in components/search and chrome/browser/search

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/memory/ptr_util.h"
 #include "base/metrics/field_trial.h"
@@ skipping 539 matching lines @@
 }
 
 TEST_F(SearchTest, GetSearchURLs) {
   std::vector<GURL> search_urls = GetSearchURLs(profile());
   EXPECT_EQ(2U, search_urls.size());
   EXPECT_EQ("http://foo.com/alt#quux=", search_urls[0].spec());
   EXPECT_EQ("http://foo.com/url?bar=", search_urls[1].spec());
 }
 
 TEST_F(SearchTest, GetSearchResultPrefetchBaseURL) {
-  EXPECT_TRUE(ShouldPrefetchSearchResults());
   EXPECT_EQ(GURL("https://foo.com/instant?ion=1&foo=foo#foo=foo&strk"),
             GetSearchResultPrefetchBaseURL(profile()));
 }
 
 struct ExtractSearchTermsTestCase {
   const char* url;
   const char* expected_result;
   const char* comment;
 };
 
 TEST_F(SearchTest, ExtractSearchTermsFromURL) {
   const ExtractSearchTermsTestCase kTestCases[] = {
     {chrome::kChromeSearchLocalNtpUrl,           "",    "NTP url"},
     {"https://foo.com/instant?strk",             "",    "Invalid search url"},
     {"https://foo.com/instant#strk",             "",    "Invalid search url"},
     {"https://foo.com/alt#quux=foo",             "foo", "Valid search url"},
     {"https://foo.com/alt#quux=foo&strk",        "foo", "Valid search url"}
   };
 
   for (size_t i = 0; i < arraysize(kTestCases); ++i) {
     const ExtractSearchTermsTestCase& test = kTestCases[i];
     EXPECT_EQ(test.expected_result,
               base::UTF16ToASCII(
                   ExtractSearchTermsFromURL(profile(), GURL(test.url))))
         << test.url << " " << test.comment;
   }
 }
 
-struct QueryExtractionAllowedTestCase {
-  const char* url;
-  bool expected_result;
-  const char* comment;
-};
-
-TEST_F(SearchTest, IsQueryExtractionAllowedForURL) {
-  const QueryExtractionAllowedTestCase kTestCases[] = {
-    {"http://foo.com/instant?strk",       false, "HTTP URL"},
-    {"https://foo.com/instant?strk",      true,  "Valid URL"},
-    {"https://foo.com/instant?",          false,
-     "No search terms replacement key"},
-    {"https://foo.com/alt#quux=foo",      false,
-     "No search terms replacement key"},
-    {"https://foo.com/alt#quux=foo&strk", true,  "Valid search url"}
-  };
-
-  for (size_t i = 0; i < arraysize(kTestCases); ++i) {
-    const QueryExtractionAllowedTestCase& test = kTestCases[i];
-    EXPECT_EQ(test.expected_result,
-              IsQueryExtractionAllowedForURL(profile(), GURL(test.url)))
-        << test.url << " " << test.comment;
-  }
-}
-
 // Regression test for https://crbug.com/605720: Set up a search provider backed
 // by localhost on a specific port, like browsertests do.  The chrome-search://
 // URLs generated in this mode should not have ports.
 TEST_F(SearchTest, SearchProviderWithPort) {
   TemplateURLService* template_url_service =
       TemplateURLServiceFactory::GetForProfile(profile());
   TemplateURLData data;
   data.SetShortName(base::ASCIIToUTF16("localhost"));
   data.SetURL("https://[::1]:1993/url?bar={searchTerms}");
   data.instant_url =
@@ skipping 44 matching lines @@
   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