Don't set ion=1 for hidden Instant modes.

chrome/browser/search_engines/search_terms_data.cc

 // Copyright (c) 2011 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_engines/search_terms_data.h"
 
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/google/google_url_tracker.h"
+#include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/instant/instant_field_trial.h"
 #include "content/public/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
 
 #if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/rlz/rlz.h"
 #endif
 
 using content::BrowserThread;
@@ skipping 17 matching lines @@
   // a variable.
   const std::string suggest_path("/complete/");
   repl.SetPathStr(suggest_path);
 
   // Clear the query and ref.
   repl.ClearQuery();
   repl.ClearRef();
   return base_url.ReplaceComponents(repl).spec();
 }
 
+std::string SearchTermsData::InstantEnabledParam() const {
+  return std::string();
+}
+
 std::string SearchTermsData::InstantFieldTrialUrlParam() const {
   return std::string();
 }
 
 // static
 std::string* UIThreadSearchTermsData::google_base_url_ = NULL;
 
 UIThreadSearchTermsData::UIThreadSearchTermsData() : profile_(NULL) {
   // GoogleURLTracker::GoogleURL() DCHECKs this also, but adding it here helps
   // us catch bad behavior at a more common place in this code.
@@ skipping 26 matching lines @@
       !google_util::IsOrganic(brand)) {
     // This call will return false the first time(s) it is called until the
     // value has been cached. This normally would mean that at most one omnibox
     // search might not send the RLZ data but this is not really a problem.
     RLZTracker::GetAccessPointRlz(rlz_lib::CHROME_OMNIBOX, &rlz_string);
   }
   return rlz_string;
 }
 #endif
 
+std::string UIThreadSearchTermsData::InstantEnabledParam() const {
+  DCHECK(!BrowserThread::IsWellKnownThread(BrowserThread::UI) ||
+         BrowserThread::CurrentlyOn(BrowserThread::UI));
+  if (profile_ && InstantController::IsEnabled(profile_) &&
+      !InstantFieldTrial::IsHiddenExperiment(profile_)) {
+    return "&ion=1";
+  }
+  return std::string();
+}
+
 std::string UIThreadSearchTermsData::InstantFieldTrialUrlParam() const {
   DCHECK(!BrowserThread::IsWellKnownThread(BrowserThread::UI) ||
          BrowserThread::CurrentlyOn(BrowserThread::UI));
   return InstantFieldTrial::GetGroupAsUrlParam(profile_);
 }
 
 // static
 void UIThreadSearchTermsData::SetGoogleBaseURL(std::string* google_base_url) {
   delete google_base_url_;
   google_base_url_ = google_base_url;
 }