Cleanup in components/search and chrome/browser/search

chrome/browser/search/search.h

 // Copyright 2012 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.
 
 #ifndef CHROME_BROWSER_SEARCH_SEARCH_H_
 #define CHROME_BROWSER_SEARCH_SEARCH_H_
 
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 18 matching lines @@
   CACHEABLE_NTP_LOAD_SUCCEEDED = 1,
   CACHEABLE_NTP_LOAD_MAX = 2
 };
 
 // Returns whether the suggest is enabled for the given |profile|.
 bool IsSuggestPrefEnabled(Profile* profile);
 
 // Extracts and returns search terms from |url|.
 base::string16 ExtractSearchTermsFromURL(Profile* profile, const GURL& url);
 
-// Returns true if it is okay to extract search terms from |url|. |url| must
-// have a secure scheme and must contain the search terms replacement key for
-// the default search provider.
-bool IsQueryExtractionAllowedForURL(Profile* profile, const GURL& url);
-
 // Returns true if |url| should be rendered in the Instant renderer process.
 bool ShouldAssignURLToInstantRenderer(const GURL& url, Profile* profile);
 
 // Returns true if |contents| is rendered inside the Instant process for
 // |profile|.
 bool IsRenderedInInstantProcess(const content::WebContents* contents,
                                 Profile* profile);
 
 // Returns true if the Instant |url| should use process per site.
 bool ShouldUseProcessPerSiteForInstantURL(const GURL& url, Profile* profile);
@@ skipping 64 matching lines @@
 // Rewrites |url| to the actual NTP URL to use if
 //   1. |url| is "chrome://newtab",
 //   2. InstantExtended is enabled, and
 //   3. |browser_context| doesn't correspond to an incognito profile.
 bool HandleNewTabURLRewrite(GURL* url,
                             content::BrowserContext* browser_context);
 // Reverses the operation from HandleNewTabURLRewrite.
 bool HandleNewTabURLReverseRewrite(GURL* url,
                                    content::BrowserContext* browser_context);
 
-// -----------------------------------------------------
-// The following APIs are exposed for use in tests only.

[Marc Treib, 2017/01/24 08:57:20]

Not true, it's used in non-testing code too.

-// -----------------------------------------------------
-
 // Returns the Cacheable New Tab Page URL for the given |profile|.
 GURL GetNewTabPageURL(Profile* profile);
 
 }  // namespace search
 
 #endif  // CHROME_BROWSER_SEARCH_SEARCH_H_