Cleanup in components/search and chrome/browser/search

chrome/browser/search/search.h

Index: chrome/browser/search/search.h
diff --git a/chrome/browser/search/search.h b/chrome/browser/search/search.h
index 86d66d4fca34982dc5834a865966b31c01c63d55..c68bc71cd224bf1646adf0a0e8674d36f31cd175 100644
--- a/chrome/browser/search/search.h
+++ b/chrome/browser/search/search.h
@@ -36,11 +36,6 @@ 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);
 
@@ -125,10 +120,6 @@ bool HandleNewTabURLRewrite(GURL* url,
 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);