Remove search::IsQueryExtractionEnabled

components/search/search.cc

 // Copyright 2014 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 "components/search/search.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
@@ skipping 37 matching lines @@
 // Dev & Canary, for now the code accepts both names.
 // TODO(dcblack): Remove the InstantExtended name once M31 hits the Beta
 // channel.
 const char kInstantExtendedFieldTrialName[] = "InstantExtended";
 const char kEmbeddedSearchFieldTrialName[] = "EmbeddedSearch";
 
 // If the field trial's group name ends with this string its configuration will
 // 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";

[kmadhusu, 2016/08/10 20:19:52]

Some of the expired finch trials have references to this flag name (go/uervm).
Please update those references accordingly.

[Marc Treib, 2016/08/11 09:59:14]

AFAIK we don't have a policy of updating historic field trials?
I mean, I can update them if you want, but TBH I don't see the point?

[kmadhusu, 2016/08/11 22:17:12]

Its been a long time since I updated the field trial. So, I am not familiar
about the current policy. If we can't update them, that's fine to me.

-#endif
-
 #if defined(OS_ANDROID)
 const char kPrefetchSearchResultsFlagName[] = "prefetch_results";
 
 // Controls whether to reuse prerendered Instant Search base page to commit any
 // search query.
 const char kReuseInstantSearchBasePage[] = "reuse_instant_search_base_page";
 #endif
 
 }  // namespace
 
@@ skipping 84 matching lines @@
 
 // Given a FieldTrialFlags object, returns the boolean value of the provided
 // flag.
 bool GetBoolValueForFlagWithDefault(const std::string& flag,
                                     bool default_value,
                                     const FieldTrialFlags& flags) {
   return !!GetUInt64ValueForFlagWithDefault(flag, default_value ? 1 : 0, flags);
 }
 
 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()) + "&";
 }
 
 std::string ForceInstantResultsParam(bool for_prerender) {
   return (for_prerender || !IsInstantExtendedAPIEnabled()) ? "ion=1&"
                                                            : 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;
 
 #if defined(OS_ANDROID)
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kPrefetchSearchResults)) {
     return true;
   }
 
@@ skipping 22 matching lines @@
 
 // |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) {
   return template_url->HasSearchTermsReplacementKey(url) &&
          (url.SchemeIsCryptographic() ||
           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