Add ability to set RLZ statically for OS_ANDROID

chrome/browser/search_engines/search_terms_data.h

Index: chrome/browser/search_engines/search_terms_data.h
diff --git a/chrome/browser/search_engines/search_terms_data.h b/chrome/browser/search_engines/search_terms_data.h
index e941b9ee929aa7ad7bceda81c4072385906f905c..e24de4a2287c0b576cd9443819a60108f98d70ad 100644
--- a/chrome/browser/search_engines/search_terms_data.h
+++ b/chrome/browser/search_engines/search_terms_data.h
@@ -10,6 +10,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/lazy_instance.h"
 #include "base/string16.h"
 
 class Profile;
@@ -33,11 +34,9 @@ class SearchTermsData {
   // "en" and thus should be overridden where the result is actually meaningful.
   virtual std::string GetApplicationLocale() const;
 
-#if defined(ENABLE_RLZ)
   // Returns the value for the Chrome Omnibox rlz.  This implementation returns
   // the empty string.
   virtual string16 GetRlzParameterValue() const;
-#endif
 
   // Returns a string indicating whether Instant (in the visible-preview mode)
   // is enabled, suitable for adding as a query string param to the homepage
@@ -60,17 +59,17 @@ class UIThreadSearchTermsData : public SearchTermsData {
 
   virtual std::string GoogleBaseURLValue() const OVERRIDE;
   virtual std::string GetApplicationLocale() const OVERRIDE;
-#if defined(ENABLE_RLZ)
   virtual string16 GetRlzParameterValue() const OVERRIDE;
-#endif
   virtual std::string InstantEnabledParam() const OVERRIDE;
 
   // Used by tests to override the value for the Google base URL.  Passing the
   // empty string cancels this override.
   static void SetGoogleBaseURL(const std::string& base_url);
 
+  static void SetStaticRlz(const string16& rlz);

[Peter Kasting, 2012/05/19 02:00:55]

Nit: Call this SetRlzParameterValue().  Write a comment explaining what it does.
 (While you're at it, write one for
UIThreadSearchTermsData::GetRlzParameterValue() too, and maybe the other
overrides.)

  private:

[Peter Kasting, 2012/05/19 02:00:55]

Nit: Newline above

   static std::string* google_base_url_;
+  static base::LazyInstance<string16>::Leaky g_static_rlz;

[Peter Kasting, 2012/05/19 02:00:55]

Nit: Call this |rlz_parameter_value_|

   Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(UIThreadSearchTermsData);