Move branding information out of google_util

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/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/google/google_brand.h"
 #include "chrome/browser/google/google_profile_helper.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/search/search.h"
 #include "chrome/browser/sync/glue/device_info.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
@@ skipping 93 matching lines @@
 #if !defined(OS_ANDROID)
 base::string16 UIThreadSearchTermsData::GetRlzParameterValue(
     bool from_app_list) const {
   DCHECK(!BrowserThread::IsThreadInitialized(BrowserThread::UI) ||
       BrowserThread::CurrentlyOn(BrowserThread::UI));
   base::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)) {
+  if (google_brand::GetBrand(&brand) && !brand.empty() &&
+      !google_brand::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.
     rlz_lib::AccessPoint access_point = RLZTracker::ChromeOmnibox();
 #if !defined(OS_IOS)
     if (from_app_list)
       access_point = RLZTracker::ChromeAppList();
 #endif
     RLZTracker::GetAccessPointRlz(access_point, &rlz_string);
   }
@@ skipping 61 matching lines @@
 #endif  // defined(ENABLE_THEMES)
 
   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);
 }