Adds InstantExtendedEnabledParam to the search request URL iff the query extraction flag is enabled.

chrome/browser/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/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 344 matching lines @@
 uint64 EmbeddedSearchPageVersion() {
   FieldTrialFlags flags;
   if (GetFieldTrialInfo(&flags)) {
     return GetUInt64ValueForFlagWithDefault(kEmbeddedPageVersionFlagName,
                                             kEmbeddedPageVersionDefault,
                                             flags);
   }
   return kEmbeddedPageVersionDefault;
 }
 
+std::string InstantExtendedEnabledParam(bool for_search) {
+#if !defined(OS_IOS) && !defined(OS_ANDROID)

[samarth, 2014/02/04 17:17:05]

Why are these ifdefs necessary?  IsQueryExtractionEnabled already returns true
for mobile.

[kmadhusu, 2014/02/04 17:49:59]

ifdefs are not required here. Since I passed "false" in
toolbar_model_android.cc, I thought it would be better to add ifdefs here so
that I can revisit the code and update later.

[kmadhusu, 2014/02/04 19:39:54]

Removed.

+  // On mobile, query extraction is always enabled.
+  if (for_search && !chrome::IsQueryExtractionEnabled())
+    return std::string();
+#endif
+
+  return std::string(google_util::kInstantExtendedAPIParam) + "=" +
+      base::Uint64ToString(EmbeddedSearchPageVersion()) + "&";
+}
+
 bool IsQueryExtractionEnabled() {
 #if defined(OS_IOS) || defined(OS_ANDROID)
   return true;
 #else
   if (!IsInstantExtendedAPIEnabled())
     return false;
 
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kEnableQueryExtraction))
     return true;
@@ skipping 401 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);
 }
 
 }  // namespace chrome