Instant cleanup: Remove unused Android-only cmdline switches

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"
 #include "base/strings/string_number_conversions.h"
-#include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
-#include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "components/google/core/browser/google_util.h"
-#include "components/search/search_switches.h"
 #include "components/search_engines/template_url.h"
 #include "url/gurl.h"
 
 namespace search {
 
 namespace {
 
 // Configuration options for Embedded Search.
 // EmbeddedSearch field trials are named in such a way that we can parse out
 // the experiment configuration from the trial's group name in order to give
@@ skipping 43 matching lines @@
 #elif defined(OS_ANDROID)
   return EmbeddedSearchPageVersion() == kEmbeddedSearchEnabledVersion;
 #else
   return true;
 #endif  // defined(OS_IOS)
 }
 
 // Determine what embedded search page version to request from the user's
 // default search provider. If 0, the embedded search UI should not be enabled.
 uint64_t EmbeddedSearchPageVersion() {
-#if defined(OS_ANDROID)
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableEmbeddedSearchAPI)) {
-    return kEmbeddedSearchEnabledVersion;
-  }
-#endif
-
   FieldTrialFlags flags;
   if (GetFieldTrialInfo(&flags)) {
     return GetUInt64ValueForFlagWithDefault(kEmbeddedPageVersionFlagName,
                                             kEmbeddedPageVersionDefault,
                                             flags);
   }
   return kEmbeddedPageVersionDefault;
 }
 
 bool GetFieldTrialInfo(FieldTrialFlags* flags) {
@@ skipping 71 matching lines @@
 std::string ForceInstantResultsParam(bool for_prerender) {
   return (for_prerender || !IsInstantExtendedAPIEnabled()) ? "ion=1&"
                                                            : std::string();
 }
 
 bool ShouldPrefetchSearchResults() {
   if (!IsInstantExtendedAPIEnabled())
     return false;
 
 #if defined(OS_ANDROID)
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kPrefetchSearchResults)) {
-    return true;
-  }
-
   FieldTrialFlags flags;
   return GetFieldTrialInfo(&flags) &&
          GetBoolValueForFlagWithDefault(kPrefetchSearchResultsFlagName, false,
                                         flags);
 #else
   return true;
 #endif
 }
 
 bool ShouldReuseInstantSearchBasePage() {
@@ skipping 13 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));
 }
 
 }  // namespace search