Move branding information out of google_util

chrome/browser/extensions/updater/manifest_fetch_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/extensions/updater/manifest_fetch_data.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
-#include "chrome/browser/google/google_util.h"
+#include "chrome/browser/google/google_brand.h"
 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
 #include "chrome/browser/omaha_query_params/omaha_query_params.h"
 #include "net/base/escape.h"
 
 namespace {
 
 // Maximum length of an extension manifest update check url, since it is a GET
 // request. We want to stay under 2K because of proxies, etc.
 const int kExtensionsManifestMaxURLSize = 2000;
 
@@ skipping 60 matching lines @@
     // Make sure the update_url_data string is escaped before using it so that
     // there is no chance of overriding the id or v other parameter value
     // we place into the x= value.
     parts.push_back("ap=" + net::EscapeQueryParamValue(update_url_data, true));
   }
 
   // Append brand code, rollcall and active ping parameters.
   if (base_url_.DomainIs("google.com")) {
 #if defined(GOOGLE_CHROME_BUILD)
     std::string brand;
-    google_util::GetBrand(&brand);
-    if (!brand.empty() && !google_util::IsOrganic(brand))
+    google_brand::GetBrand(&brand);
+    if (!brand.empty() && !google_brand::IsOrganic(brand))
       parts.push_back("brand=" + brand);
 #endif
 
     std::string ping_value;
     pings_[id] = PingData(0, 0, false);
 
     if (ping_data) {
       if (ping_data->rollcall_days == kNeverPinged ||
           ping_data->rollcall_days > 0) {
         ping_value += "r=" + base::IntToString(ping_data->rollcall_days);
@@ skipping 50 matching lines @@
     NOTREACHED();
   return value == kNeverPinged || value > 0;
 }
 
 void ManifestFetchData::Merge(const ManifestFetchData& other) {
   DCHECK(full_url() == other.full_url());
   request_ids_.insert(other.request_ids_.begin(), other.request_ids_.end());
 }
 
 }  // namespace extensions