Send the value of google_brand::GetBrand in component update checks.

chrome/browser/component_updater/chrome_component_updater_configurator.cc

 // Copyright 2014 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/component_updater/chrome_component_updater_configurator.h"
 
 #include <string>
 #include <vector>
 
 #include "base/strings/sys_string_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/version.h"
 #if defined(OS_WIN)
 #include "base/win/win_util.h"
 #endif
 #include "chrome/browser/component_updater/component_patcher_operation_out_of_process.h"
+#include "chrome/browser/google/google_brand.h"
 #include "chrome/browser/update_client/chrome_update_query_params_delegate.h"
 #include "chrome/common/channel_info.h"
 #if defined(OS_WIN)
 #include "chrome/installer/util/google_update_settings.h"
 #endif
 #include "components/component_updater/configurator_impl.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace component_updater {
 
 namespace {
 
 class ChromeConfigurator : public update_client::Configurator {
  public:
   ChromeConfigurator(const base::CommandLine* cmdline,
                      net::URLRequestContextGetter* url_request_getter);
 
   // update_client::Configurator overrides.
   int InitialDelay() const override;
   int NextCheckDelay() const override;
   int StepDelay() const override;
   int OnDemandDelay() const override;
   int UpdateDelay() const override;
   std::vector<GURL> UpdateUrl() const override;
   std::vector<GURL> PingUrl() const override;
   base::Version GetBrowserVersion() const override;
   std::string GetChannel() const override;
+  std::string GetBrand() const override;
   std::string GetLang() const override;
   std::string GetOSLongName() const override;
   std::string ExtraRequestParams() const override;
   std::string GetDownloadPreference() const override;
   net::URLRequestContextGetter* RequestContext() const override;
   scoped_refptr<update_client::OutOfProcessPatcher> CreateOutOfProcessPatcher()
       const override;
   bool DeltasEnabled() const override;
   bool UseBackgroundDownloader() const override;
   bool UseCupSigning() const override;
@@ skipping 42 matching lines @@
 }
 
 base::Version ChromeConfigurator::GetBrowserVersion() const {
   return configurator_impl_.GetBrowserVersion();
 }
 
 std::string ChromeConfigurator::GetChannel() const {
   return chrome::GetChannelString();
 }
 
+std::string ChromeConfigurator::GetBrand() const {
+  std::string brand;
+  google_brand::GetBrand(&brand);
+  return brand;
+}
+
 std::string ChromeConfigurator::GetLang() const {
   return ChromeUpdateQueryParamsDelegate::GetLang();
 }
 
 std::string ChromeConfigurator::GetOSLongName() const {
   return configurator_impl_.GetOSLongName();
 }
 
 std::string ChromeConfigurator::ExtraRequestParams() const {
   return configurator_impl_.ExtraRequestParams();
@@ skipping 48 matching lines @@
 }  // namespace
 
 scoped_refptr<update_client::Configurator>
 MakeChromeComponentUpdaterConfigurator(
     const base::CommandLine* cmdline,
     net::URLRequestContextGetter* context_getter) {
   return new ChromeConfigurator(cmdline, context_getter);
 }
 
 }  // namespace component_updater