Fix build break of official builder due to my commit 104479 which was missing

a necessary file.

BUG=None
TEST=No user visible changes
Review URL: http://codereview.chromium.org/8200012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104562 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 8 insertions, 8 deletions

diff --git a/chrome/browser/search_engines/search_terms_data.cc b/chrome/browser/search_engines/search_terms_data.cc
index be64c9b..3f99aa1 100644
--- a/chrome/browser/search_engines/search_terms_data.cc
+++ b/chrome/browser/search_engines/search_terms_data.cc
@@ -13,8 +13,8 @@
 #include "googleurl/src/gurl.h"
 
 #if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
+#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/rlz/rlz.h"
-#include "chrome/installer/util/google_update_settings.h"
 #endif
 
 SearchTermsData::SearchTermsData() {
@@ -74,9 +74,9 @@ string16 UIThreadSearchTermsData::GetRlzParameterValue() const {
   string16 rlz_string;
   // For organic brandcodes do not use rlz at all. Empty brandcode usually
   // means a chromium install. This is ok.
-  string16 brand;
-  if (GoogleUpdateSettings::GetBrand(&brand) && !brand.empty() &&
-      !GoogleUpdateSettings::IsOrganic(brand)) {
+  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.
diff --git a/chrome/browser/search_engines/template_url.cc b/chrome/browser/search_engines/template_url.cc
index 93564ab..8a09947 100644
--- a/chrome/browser/search_engines/template_url.cc
+++ b/chrome/browser/search_engines/template_url.cc
@@ -12,12 +12,12 @@
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/search_engines/search_engine_type.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/common/guid.h"
 #include "chrome/common/url_constants.h"
-#include "chrome/installer/util/google_update_settings.h"
 #include "content/browser/user_metrics.h"
 #include "net/base/escape.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -570,10 +570,10 @@ void TemplateURLRef::CollectRLZMetrics() const {
   for (size_t i = 0; i < replacements_.size(); ++i) {
     // We are interesed in searches that were supposed to send the RLZ token.
     if (replacements_[i].type == GOOGLE_RLZ) {
-      string16 brand;
+      std::string brand;
       // We only have RLZ tocken on a branded browser version.
-      if (GoogleUpdateSettings::GetBrand(&brand) && !brand.empty() &&
-           !GoogleUpdateSettings::IsOrganic(brand)) {
+      if (google_util::GetBrand(&brand) && !brand.empty() &&
+           !google_util::IsOrganic(brand)) {
         // Now we know we should have had RLZ token check if there was one.
         if (url().find("rlz=") != std::string::npos)
           UserMetrics::RecordAction(UserMetricsAction("SearchWithRLZ"));