Remove search::IsQueryExtractionEnabled

components/search/search.cc

Index: components/search/search.cc
diff --git a/components/search/search.cc b/components/search/search.cc
index db31c283f61d039df9fe29096cc211a66629e4f6..97cdacb9856e289ec53621c7db0b4be12fe671ba 100644
--- a/components/search/search.cc
+++ b/components/search/search.cc
@@ -55,10 +55,6 @@ const char kEmbeddedSearchFieldTrialName[] = "EmbeddedSearch";
 // be ignored and Instant Extended will not be enabled by default.
 const char kDisablingSuffix[] = "DISABLED";
 
-#if !defined(OS_IOS) && !defined(OS_ANDROID)
-const char kEnableQueryExtractionFlagName[] = "query_extraction";
-#endif
-
 #if defined(OS_ANDROID)
 const char kPrefetchSearchResultsFlagName[] = "prefetch_results";
 
@@ -163,7 +159,8 @@ bool GetBoolValueForFlagWithDefault(const std::string& flag,
 }
 
 std::string InstantExtendedEnabledParam(bool for_search) {
-  if (for_search && !IsQueryExtractionEnabled())
+  // TODO(treib): Remove |for_search| and update callers that set it to true.
+  if (for_search)
     return std::string();
   return std::string(google_util::kInstantExtendedAPIParam) + "=" +
          base::Uint64ToString(EmbeddedSearchPageVersion()) + "&";
@@ -174,25 +171,6 @@ std::string ForceInstantResultsParam(bool for_prerender) {
                                                            : std::string();
 }
 
-bool IsQueryExtractionEnabled() {
-#if defined(OS_IOS) || defined(OS_ANDROID)
-  return false;
-#else
-  if (!IsInstantExtendedAPIEnabled())
-    return false;
-
-  const base::CommandLine* command_line =
-      base::CommandLine::ForCurrentProcess();
-  if (command_line->HasSwitch(switches::kEnableQueryExtraction))
-    return true;
-
-  FieldTrialFlags flags;
-  return GetFieldTrialInfo(&flags) &&
-         GetBoolValueForFlagWithDefault(kEnableQueryExtractionFlagName, false,
-                                        flags);
-#endif  // defined(OS_IOS) || defined(OS_ANDROID)
-}
-
 bool ShouldPrefetchSearchResults() {
   if (!IsInstantExtendedAPIEnabled())
     return false;
@@ -235,11 +213,4 @@ bool IsSuitableURLForInstant(const GURL& url, const TemplateURL* template_url) {
           google_util::StartsWithCommandLineGoogleBaseURL(url));
 }
 
-void EnableQueryExtractionForTesting() {
-#if !defined(OS_IOS) && !defined(OS_ANDROID)
-  base::CommandLine* cl = base::CommandLine::ForCurrentProcess();
-  cl->AppendSwitch(switches::kEnableQueryExtraction);
-#endif
-}
-
 }  // namespace search