Add Android-specific parameters to search_engines/

chrome/browser/search_engines/search_terms_data.cc

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 b623fefeb5a7e84d09237ca3ca03f0a1906eb9b8..e01df2cedff89e93f47d0387214e86c748dd4635 100644
--- a/chrome/browser/search_engines/search_terms_data.cc
+++ b/chrome/browser/search_engines/search_terms_data.cc
@@ -5,7 +5,6 @@
 #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/google/google_util.h"
@@ -16,10 +15,13 @@
 #include "googleurl/src/gurl.h"
 
 #if defined(ENABLE_RLZ)
-#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/rlz/rlz.h"
 #endif
 
+#if defined(OS_ANDROID)
+#include "chrome/browser/search_engines/search_terms_data_android.h"
+#endif
+
 using content::BrowserThread;
 
 SearchTermsData::SearchTermsData() {
@@ -56,11 +58,13 @@ std::string SearchTermsData::GetApplicationLocale() const {
   return "en";
 }
 
-#if defined(ENABLE_RLZ)
 string16 SearchTermsData::GetRlzParameterValue() const {
   return string16();
 }
-#endif
+
+std::string SearchTermsData::GetSearchClient() const {
+  return std::string();
+}
 
 std::string SearchTermsData::InstantEnabledParam() const {
   return std::string();
@@ -90,11 +94,11 @@ std::string UIThreadSearchTermsData::GetApplicationLocale() const {
   return g_browser_process->GetApplicationLocale();
 }
 
-#if defined(ENABLE_RLZ)
 string16 UIThreadSearchTermsData::GetRlzParameterValue() const {
   DCHECK(!BrowserThread::IsWellKnownThread(BrowserThread::UI) ||
          BrowserThread::CurrentlyOn(BrowserThread::UI));
   string16 rlz_string;
+#if defined(ENABLE_RLZ)
   // For organic brandcodes do not use rlz at all. Empty brandcode usually
   // means a chromium install. This is ok.
   std::string brand;
@@ -105,9 +109,23 @@ string16 UIThreadSearchTermsData::GetRlzParameterValue() const {
     // search might not send the RLZ data but this is not really a problem.
     RLZTracker::GetAccessPointRlz(RLZTracker::CHROME_OMNIBOX, &rlz_string);
   }
+#elif defined(OS_ANDROID)

[Peter Kasting, 2012/12/05 21:28:47]

Another way to do this: put these two entire functions inside one large "#if
!defined(OS_ANDROID)", then in your .cc file, define these functions directly in
terms of whatever you want.

This involves fewer #ifs, including eliminating the #include atop this file, and
probably results in slightly fewer symbols overall.  But it's not a huge
difference.

[gone, 2012/12/06 01:43:58]

Done.

+  // Android doesn't use the rlz library.  Instead, it manages the rlz string
+  // on its own.
+  return SearchTermsDataAndroid::GetRlzParameterValue();
+#endif
   return rlz_string;
 }
+
+std::string UIThreadSearchTermsData::GetSearchClient() const {
+  DCHECK(!BrowserThread::IsWellKnownThread(BrowserThread::UI) ||
+         BrowserThread::CurrentlyOn(BrowserThread::UI));
+#if defined(OS_ANDROID)
+  return SearchTermsDataAndroid::GetSearchClient();
+#else
+  return std::string();
 #endif
+}
 
 std::string UIThreadSearchTermsData::InstantEnabledParam() const {
   DCHECK(!BrowserThread::IsWellKnownThread(BrowserThread::UI) ||