Cleanup in components/search and chrome/browser/search

components/search/search.h

Index: components/search/search.h
diff --git a/components/search/search.h b/components/search/search.h
index 0f0d5e364cb5af17cfc5be75bcf5c8b48e9d5a51..9320e8fa55f55b92e06f58bc6895104763875787 100644
--- a/components/search/search.h
+++ b/components/search/search.h
@@ -11,9 +11,6 @@
 
 #include "base/strings/string_split.h"
 
-class GURL;
-class TemplateURL;
-
 namespace search {
 
 // Returns whether the Instant Extended API is enabled. This is always true on
@@ -37,13 +34,6 @@ typedef base::StringPairs FieldTrialFlags;
 // Exposed for testing only.
 bool GetFieldTrialInfo(FieldTrialFlags* flags);
 
-// Given a FieldTrialFlags object, returns the string value of the provided
-// flag.
-// Exposed for testing only.
-std::string GetStringValueForFlagWithDefault(const std::string& flag,
-                                             const std::string& default_value,
-                                             const FieldTrialFlags& flags);
-
 // Given a FieldTrialFlags object, returns the uint64_t value of the provided
 // flag.
 // Exposed for testing only.
@@ -51,12 +41,6 @@ uint64_t GetUInt64ValueForFlagWithDefault(const std::string& flag,
                                           uint64_t default_value,
                                           const FieldTrialFlags& flags);
 
-// Given a FieldTrialFlags object, returns the bool value of the provided flag.
-// Exposed for testing only.
-bool GetBoolValueForFlagWithDefault(const std::string& flag,
-                                    bool default_value,
-                                    const FieldTrialFlags& flags);
-
 // Returns a string indicating whether InstantExtended is enabled, suitable
 // for adding as a query string param to the homepage or search requests.
 std::string InstantExtendedEnabledParam();
@@ -71,19 +55,6 @@ std::string InstantExtendedEnabledParam();
 // the returned string to be non-empty.
 std::string ForceInstantResultsParam(bool for_prerender);
 
-// Returns whether to prefetch high-confidence search suggestions. True iff
-// the Instant Extended API is enabled.
-bool ShouldPrefetchSearchResults();
-
-// Returns whether to reuse the prerendered page to commit any search query.
-// True iff the Instant Extended API is enabled.
-bool ShouldReuseInstantSearchBasePage();
-
-// |url| should either have a secure scheme or have a non-HTTPS base URL that
-// the user specified using --google-base-url. (This allows testers to use
-// --google-base-url to point at non-HTTPS servers, which eases testing.)
-bool IsSuitableURLForInstant(const GURL& url, const TemplateURL* template_url);
-
 }  // namespace search
 
 #endif  // COMPONENTS_SEARCH_SEARCH_H_