Enable query extraction for Android

chrome/browser/ui/search/search.cc

Index: chrome/browser/ui/search/search.cc
diff --git a/chrome/browser/ui/search/search.cc b/chrome/browser/ui/search/search.cc
index e6d79bd0b396f29bd7fe61063768d7ef381625c2..0307227831eeeb8088611fb5bd9a3691ebddda1e 100644
--- a/chrome/browser/ui/search/search.cc
+++ b/chrome/browser/ui/search/search.cc
@@ -29,7 +29,12 @@ namespace {
 // 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";
+
+#if defined(OS_IOS) || defined(OS_ANDROID)
+const int kEmbeddedPageVersionDefault = 1;
+#else
 const int kEmbeddedPageVersionDefault = 2;
+#endif
 
 const char kInstantExtendedActivationName[] = "instant";
 const chrome::search::InstantExtendedDefault kInstantExtendedActivationDefault =
@@ -138,12 +143,21 @@ InstantExtendedDefault GetInstantExtendedDefaultSetting() {
 }
 
 bool IsInstantExtendedAPIEnabled(const Profile* profile) {
+#if defined(OS_IOS) || defined(OS_ANDROID)
+  return false;
+#else
   return EmbeddedSearchPageVersion(profile) != 0;
+#endif //  defined(OS_IOS) || defined(OS_ANDROID)

[sreeram, 2013/03/02 00:16:18]

Nit: I meant two spaces _before_ the "//", not after the "//".

[Yusuf, 2013/03/02 00:26:29]

:) Sorry about that.Fixed now.

On 2013/03/02 00:16:18, sreeram wrote:

 }
 
 // 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(const Profile* profile) {
+#if defined(OS_IOS) || defined(OS_ANDROID)
+  const CommandLine* cl = CommandLine::ForCurrentProcess();
+  if (cl->HasSwitch(switches::kEnableQueryExtraction))
+    return kEmbeddedPageVersionDefault;
+#else
   if (!profile || profile->IsOffTheRecord())
     return 0;
 
@@ -162,19 +176,19 @@ uint64 EmbeddedSearchPageVersion(const Profile* profile) {
     // UI version.
     return kEmbeddedPageVersionDefault;
   }
-
+#endif //  defined(OS_IOS) || defined(OS_ANDROID)
   return 0;
 }
 
 bool IsQueryExtractionEnabled(const Profile* profile) {
-#if defined(OS_IOS)
+#if defined(OS_IOS) || defined(OS_ANDROID)
   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(profile);
-#endif
+#endif //  defined(OS_IOS) || defined(OS_ANDROID)
 }
 
 string16 GetSearchTermsFromNavigationEntry(
@@ -262,7 +276,7 @@ void EnableInstantExtendedAPIForTesting() {
 }
 
 void EnableQueryExtractionForTesting() {
-#if defined(OS_IOS)
+#if defined(OS_IOS) || defined(OS_ANDROID)
   CommandLine* cl = CommandLine::ForCurrentProcess();
   cl->AppendSwitch(switches::kEnableQueryExtraction);
 #else