Index: chrome/browser/search_engines/search_terms_data.cc |
diff --git a/chrome/browser/search_engines/search_terms_data.cc b/chrome/browser/search_engines/search_terms_data.cc |
index 38b0ae2222992d571dc2648746aefe0d5617ee90..0ba3b34aaf3e01f8360a932725cda83c11d083a3 100644 |
--- a/chrome/browser/search_engines/search_terms_data.cc |
+++ b/chrome/browser/search_engines/search_terms_data.cc |
@@ -8,6 +8,7 @@ |
#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" |
@@ -55,10 +56,15 @@ std::string SearchTermsData::GoogleBaseSuggestURLValue() const { |
return base_url.ReplaceComponents(repl).spec(); |
} |
+std::string SearchTermsData::InstantFieldTrialUrlParam() const { |
+ return std::string(); |
+} |
+ |
// 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) || |
@@ -97,6 +103,12 @@ string16 UIThreadSearchTermsData::GetRlzParameterValue() const { |
} |
#endif |
+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_; |