Enable query extraction for Android

chrome/browser/ui/search/search.cc

 // Copyright 2012 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 "chrome/browser/ui/search/search.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
@@ skipping 28 matching lines @@
 
 // Configuration options for Embedded Search.
 // InstantExtended 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
 // us maximum flexability in running experiments.
 // Field trial groups should be named things like "Group7 espv:2 instant:1".
 // The first token is always GroupN for some integer N, followed by a
 // space-delimited list of key:value pairs which correspond to these flags:
 const char kEmbeddedPageVersionFlagName[] = "espv";
 const uint64 kEmbeddedPageVersionDisabled = 0;
+#if defined(OS_IOS) || defined(OS_ANDROID)
+const uint64 kEmbeddedPageVersionDefault = 1;
+#else
 const uint64 kEmbeddedPageVersionDefault = 2;
+#endif
 
 const char kInstantExtendedActivationName[] = "instant";
 const InstantExtendedDefault kInstantExtendedActivationDefault =
     INSTANT_DEFAULT_ON;
 
 // Constants for the field trial name and group prefix.
 const char kInstantExtendedFieldTrialName[] = "InstantExtended";
 const char kGroupNumberPrefix[] = "Group";
 
 // If the field trial's group name ends with this string its configuration will
@@ skipping 150 matching lines @@
 }
 
 }  // namespace
 
 const char kInstantExtendedSearchTermsKey[] = "search_terms";
 
 const char kLocalOmniboxPopupURL[] =
     "chrome://local-omnibox-popup/local-omnibox-popup.html";
 
 bool IsInstantExtendedAPIEnabled() {
-  return EmbeddedSearchPageVersion() != kEmbeddedPageVersionDisabled;
+#if defined(OS_IOS) || defined(OS_ANDROID)
+  return false;
+#else
+  // On desktop, query extraction is part of Instant extended, so if one is
+  // enabled, the other is too.
+  return IsQueryExtractionEnabled();
+#endif  // defined(OS_IOS) || defined(OS_ANDROID)
 }
 
 // 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 EmbeddedSearchPageVersion() {
   // Check the command-line/about:flags setting first, which should have
   // precedence and allows the trial to not be reported (if it's never queried).
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kDisableInstantExtendedAPI)) {
     RecordInstantExtendedOptInState(OPT_OUT);
     return kEmbeddedPageVersionDisabled;
   }
   if (command_line->HasSwitch(switches::kEnableInstantExtendedAPI)) {
     // The user has set the about:flags switch to Enabled - give the default
     // UI version.
     RecordInstantExtendedOptInState(OPT_IN);
     return kEmbeddedPageVersionDefault;
   }
 
   RecordInstantExtendedOptInState(NOT_SET);
   FieldTrialFlags flags;
   if (GetFieldTrialInfo(
           base::FieldTrialList::FindFullName(kInstantExtendedFieldTrialName),
           &flags, NULL)) {
     return GetUInt64ValueForFlagWithDefault(kEmbeddedPageVersionFlagName,
                                             kEmbeddedPageVersionDefault,
                                             flags);
   }
-
   return kEmbeddedPageVersionDisabled;
 }
 
 bool IsQueryExtractionEnabled() {
-#if defined(OS_IOS)
-  const CommandLine* cl = CommandLine::ForCurrentProcess();
-  return cl->HasSwitch(switches::kEnableQueryExtraction);
-#else
-  // On desktop, query extraction is controlled by the instant-extended-api
-  // flag.
-  return IsInstantExtendedAPIEnabled();
-#endif
+  return EmbeddedSearchPageVersion() != kEmbeddedPageVersionDisabled;
 }
 
 string16 GetSearchTermsFromNavigationEntry(
     const content::NavigationEntry* entry) {
   string16 search_terms;
   if (entry)
     entry->GetExtraData(kInstantExtendedSearchTermsKey, &search_terms);
   return search_terms;
 }
 
@@ skipping 148 matching lines @@
 
 bool IsInstantEnabled(Profile* profile) {
   return GetInstantURL(profile).is_valid();
 }
 
 void EnableInstantExtendedAPIForTesting() {
   CommandLine* cl = CommandLine::ForCurrentProcess();
   cl->AppendSwitch(switches::kEnableInstantExtendedAPI);
 }
 
-void EnableQueryExtractionForTesting() {
-#if defined(OS_IOS)
-  CommandLine* cl = CommandLine::ForCurrentProcess();
-  cl->AppendSwitch(switches::kEnableQueryExtraction);
-#else
-  EnableInstantExtendedAPIForTesting();
-#endif
-}
-
 bool GetFieldTrialInfo(const std::string& group_name,
                        FieldTrialFlags* flags,
                        uint64* group_number) {
   if (EndsWith(group_name, kDisablingSuffix, true) ||
       !StartsWithASCII(group_name, kGroupNumberPrefix, true))
     return false;
 
   // We have a valid trial that starts with "Group" and isn't disabled.
   // First extract the flags.
   std::string group_prefix(group_name);
@@ skipping 72 matching lines @@
   GURL::Replacements replacements;
   replacements.SetSchemeStr(search_scheme);
   replacements.SetHostStr(search_host);
   replacements.SetPortStr(search_port);
   replacements.SetPathStr(search_path);
   return instant_url.ReplaceComponents(replacements);
 }
 
 }  // namespace search
 }  // namespace chrome