Add a URL param to indicate group selection in Instant field trial.

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_field_trial.h"
 #include "content/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
 
 #if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
 #include "chrome/browser/rlz/rlz.h"
 #include "chrome/installer/util/google_update_settings.h"
 #endif
 
 SearchTermsData::SearchTermsData() {
 }
@@ skipping 27 matching lines @@
   // Replace any existing path with "/complete/".
   static 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::InstantFieldTrialUrlParam() const {
+  return "";

[Peter Kasting, 2011/08/10 20:54:06]

Nit: Use std::string() instead of ""

+}
+
 // static
 std::string* UIThreadSearchTermsData::google_base_url_ = NULL;
 
-UIThreadSearchTermsData::UIThreadSearchTermsData() {
+UIThreadSearchTermsData::UIThreadSearchTermsData(Profile* profile)
+    : profile_(profile) {
   // GoogleURLTracker::GoogleURL() DCHECKs this also, but adding it here helps
   // us catch bad behavior at a more common place in this code.
   DCHECK(!BrowserThread::IsWellKnownThread(BrowserThread::UI) ||
          BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
 std::string UIThreadSearchTermsData::GoogleBaseURLValue() const {
   DCHECK(!BrowserThread::IsWellKnownThread(BrowserThread::UI) ||
          BrowserThread::CurrentlyOn(BrowserThread::UI));
   return google_base_url_ ?
@@ skipping 18 matching lines @@
       !GoogleUpdateSettings::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::InstantFieldTrialUrlParam() const {
+  DCHECK(!BrowserThread::IsWellKnownThread(BrowserThread::UI) ||
+         BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK(profile_);

[Peter Kasting, 2011/08/10 20:54:06]

Remove this (in conjunction with the changes to InstantFieldTrial) and document
on the constructor declaration in the header what the Profile is for and that it
may be NULL.

+  return InstantFieldTrial::GetGroupAsUrlParam(profile_);
+}
+
 // static
 void UIThreadSearchTermsData::SetGoogleBaseURL(std::string* google_base_url) {
   delete google_base_url_;
   google_base_url_ = google_base_url;
 }