Componentize component_updater: Use Configurator to build query parameters.

chrome/browser/component_updater/component_updater_configurator.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/component_updater/component_updater_configurator.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/strings/string_util.h"
+#include "base/version.h"
 #include "build/build_config.h"
+#include "chrome/browser/omaha_query_params/chrome_omaha_query_params_delegate.h"
+#include "chrome/common/chrome_version_info.h"
 #include "components/component_updater/component_updater_switches.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "url/gurl.h"
 
 namespace component_updater {
 
 namespace {
 
 // Default time constants.
 const int kDelayOneMinute = 60;
@@ skipping 69 matching lines @@
   virtual ~ChromeConfigurator() {}
 
   virtual int InitialDelay() const OVERRIDE;
   virtual int NextCheckDelay() OVERRIDE;
   virtual int StepDelay() const OVERRIDE;
   virtual int StepDelayMedium() OVERRIDE;
   virtual int MinimumReCheckWait() const OVERRIDE;
   virtual int OnDemandDelay() const OVERRIDE;
   virtual GURL UpdateUrl() const OVERRIDE;
   virtual GURL PingUrl() const OVERRIDE;
+  virtual base::Version ApplicationVersion() const OVERRIDE;
+  virtual std::string GetChannelString() const OVERRIDE;
+  virtual std::string GetLang() const OVERRIDE;
+  virtual std::string GetOSLongName() const OVERRIDE;
   virtual std::string ExtraRequestParams() const OVERRIDE;
   virtual size_t UrlSizeLimit() const OVERRIDE;
   virtual net::URLRequestContextGetter* RequestContext() const OVERRIDE;
   virtual bool InProcess() const OVERRIDE;
   virtual bool DeltasEnabled() const OVERRIDE;
   virtual bool UseBackgroundDownloader() const OVERRIDE;
 
  private:
   net::URLRequestContextGetter* url_request_getter_;
   std::string extra_info_;
@@ skipping 62 matching lines @@
 }
 
 GURL ChromeConfigurator::UpdateUrl() const {
   return GURL(url_source_);
 }
 
 GURL ChromeConfigurator::PingUrl() const {
   return pings_enabled_ ? GURL(kPingUrl) : GURL();
 }
 
+base::Version ChromeConfigurator::ApplicationVersion() const {
+  return base::Version(chrome::VersionInfo().Version());
+}
+
+

[Sorin Jianu, 2014/07/10 12:27:28]

extra empty line

[tommycli, 2014/07/10 16:08:13]

Done.

+std::string ChromeConfigurator::GetChannelString() const {
+  return ChromeOmahaQueryParamsDelegate::GetChannelString();
+}
+
+std::string ChromeConfigurator::GetLang() const {
+  return ChromeOmahaQueryParamsDelegate::GetLang();
+}
+
+std::string ChromeConfigurator::GetOSLongName() const {
+  return chrome::VersionInfo().OSType();
+}
+
 std::string ChromeConfigurator::ExtraRequestParams() const {
   return extra_info_;
 }
 
 size_t ChromeConfigurator::UrlSizeLimit() const {
   return 1024ul;
 }
 
 net::URLRequestContextGetter* ChromeConfigurator::RequestContext() const {
   return url_request_getter_;
@@ skipping 11 matching lines @@
   return background_downloads_enabled_;
 }
 
 Configurator* MakeChromeComponentUpdaterConfigurator(
     const base::CommandLine* cmdline,
     net::URLRequestContextGetter* context_getter) {
   return new ChromeConfigurator(cmdline, context_getter);
 }
 
 }  // namespace component_updater