Add Android-specific parameters to search_engines/

chrome/browser/search_engines/search_terms_data.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_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"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_instant_controller.h"
 #include "chrome/browser/ui/search/search.h"
 #include "content/public/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
 
 #if defined(ENABLE_RLZ)
-#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/rlz/rlz.h"
 #endif
 
 using content::BrowserThread;
 
 SearchTermsData::SearchTermsData() {
 }
 
 SearchTermsData::~SearchTermsData() {
 }
@@ skipping 19 matching lines @@
   // Clear the query and ref.
   repl.ClearQuery();
   repl.ClearRef();
   return base_url.ReplaceComponents(repl).spec();
 }
 
 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();
 }
 
 // static
 std::string* UIThreadSearchTermsData::google_base_url_ = NULL;
 
 UIThreadSearchTermsData::UIThreadSearchTermsData(Profile* profile)
     : profile_(profile) {
   DCHECK(!BrowserThread::IsWellKnownThread(BrowserThread::UI) ||
-         BrowserThread::CurrentlyOn(BrowserThread::UI));
+      BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
 std::string UIThreadSearchTermsData::GoogleBaseURLValue() const {
   DCHECK(!BrowserThread::IsWellKnownThread(BrowserThread::UI) ||
-         BrowserThread::CurrentlyOn(BrowserThread::UI));
+      BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (google_base_url_)
     return *google_base_url_;
   return profile_ ? GoogleURLTracker::GoogleURL(profile_).spec() :
       SearchTermsData::GoogleBaseURLValue();
 }
 
 std::string UIThreadSearchTermsData::GetApplicationLocale() const {
   DCHECK(!BrowserThread::IsWellKnownThread(BrowserThread::UI) ||
-         BrowserThread::CurrentlyOn(BrowserThread::UI));
+      BrowserThread::CurrentlyOn(BrowserThread::UI));
   return g_browser_process->GetApplicationLocale();
 }
 
-#if defined(ENABLE_RLZ)
+#if !defined(OS_ANDROID)
+// Android implementations are located in search_terms_data_android.cc.

[Peter Kasting, 2012/12/07 23:32:57]

Tiny nit: I'd put this comment above the #if

[gone, 2012/12/08 00:32:52]

Done.

 string16 UIThreadSearchTermsData::GetRlzParameterValue() const {
   DCHECK(!BrowserThread::IsWellKnownThread(BrowserThread::UI) ||
-         BrowserThread::CurrentlyOn(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;
   if (google_util::GetBrand(&brand) && !brand.empty() &&
       !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(RLZTracker::CHROME_OMNIBOX, &rlz_string);
   }
+#endif
   return rlz_string;
 }
+
+std::string UIThreadSearchTermsData::GetSearchClient() const {
+  DCHECK(!BrowserThread::IsWellKnownThread(BrowserThread::UI) ||
+         BrowserThread::CurrentlyOn(BrowserThread::UI));

[Peter Kasting, 2012/12/07 23:32:57]

Nit: Since you changed it everywhere else, indent 4 here

[gone, 2012/12/08 00:32:52]

Ah, missed this.

+  return std::string();
+}
 #endif
 
 std::string UIThreadSearchTermsData::InstantEnabledParam() const {
   DCHECK(!BrowserThread::IsWellKnownThread(BrowserThread::UI) ||
          BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (chrome::search::IsInstantExtendedAPIEnabled(profile_))
     return std::string(google_util::kInstantExtendedAPIParam) + "=1&";
   if (chrome::BrowserInstantController::IsInstantEnabled(profile_))
     return "ion=1&";
   return std::string();
 }
 
 // static
 void UIThreadSearchTermsData::SetGoogleBaseURL(const std::string& base_url) {
   delete google_base_url_;
   google_base_url_ = base_url.empty() ? NULL : new std::string(base_url);
 }