rlz: Hook up on mac, switch to chrome's network stack on win.

chrome/browser/search_engines/search_terms_data.cc

 // Copyright (c) 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/instant/instant_controller.h"
 #include "chrome/browser/instant/instant_field_trial.h"
 #include "content/public/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
 
-#if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
+#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 20 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(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
+#if defined(ENABLE_RLZ)
 string16 SearchTermsData::GetRlzParameterValue() const {
   return string16();
 }
 #endif
 
 std::string SearchTermsData::InstantEnabledParam() const {
   return std::string();
 }
 
 std::string SearchTermsData::InstantFieldTrialUrlParam() const {
@@ skipping 14 matching lines @@
   return google_base_url_ ?
     (*google_base_url_) : GoogleURLTracker::GoogleURL().spec();
 }
 
 std::string UIThreadSearchTermsData::GetApplicationLocale() const {
   DCHECK(!BrowserThread::IsWellKnownThread(BrowserThread::UI) ||
          BrowserThread::CurrentlyOn(BrowserThread::UI));
   return g_browser_process->GetApplicationLocale();
 }
 
-#if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
+#if defined(ENABLE_RLZ)
 string16 UIThreadSearchTermsData::GetRlzParameterValue() const {
   DCHECK(!BrowserThread::IsWellKnownThread(BrowserThread::UI) ||
          BrowserThread::CurrentlyOn(BrowserThread::UI));
   string16 rlz_string;
   // 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
@@ skipping 17 matching lines @@
   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_;
   google_base_url_ = google_base_url;
 }