Move branding information out of google_util

chrome/browser/profile_resetter/automatic_profile_resetter_delegate.cc

 // Copyright 2013 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/profile_resetter/automatic_profile_resetter_delegate.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/md5.h"
 #include "base/memory/scoped_vector.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/google/google_brand.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/profile_resetter/brandcode_config_fetcher.h"
 #include "chrome/browser/profile_resetter/profile_reset_global_error.h"
 #include "chrome/browser/profile_resetter/profile_resetter.h"
 #include "chrome/browser/profile_resetter/resettable_settings_snapshot.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 156 matching lines @@
   template_url_service_ready_event_.Post(FROM_HERE, ready_callback);
 }
 
 void AutomaticProfileResetterDelegateImpl::
     FetchBrandcodedDefaultSettingsIfNeeded() {
   if (brandcoded_config_fetcher_ ||
       brandcoded_defaults_fetched_event_.is_signaled())
     return;
 
   std::string brandcode;
-  google_util::GetBrand(&brandcode);
+  google_brand::GetBrand(&brandcode);
   if (brandcode.empty()) {
     brandcoded_defaults_.reset(new BrandcodedDefaultSettings);
     brandcoded_defaults_fetched_event_.Signal();
   } else {
     brandcoded_config_fetcher_.reset(new BrandcodeConfigFetcher(
         base::Bind(
             &AutomaticProfileResetterDelegateImpl::OnBrandcodedDefaultsFetched,
             base::Unretained(this)),
         GURL("https://tools.google.com/service/update2"),
         brandcode));
@@ skipping 181 matching lines @@
     if (difference) {
       old_settings_snapshot->Subtract(new_settings_snapshot);
       std::string report =
           SerializeSettingsReport(*old_settings_snapshot, difference);
       SendFeedback(report);
     }
   }
   content::BrowserThread::PostTask(
       content::BrowserThread::UI, FROM_HERE, user_callback);
 }