Componentize component_updater: Use Configurator to build query parameters.

chrome/browser/component_updater/component_updater_configurator.cc

Index: chrome/browser/component_updater/component_updater_configurator.cc
diff --git a/chrome/browser/component_updater/component_updater_configurator.cc b/chrome/browser/component_updater/component_updater_configurator.cc
index f9027e782e6688df466dc6a509ee5071edbe054d..5e8d04712fcbd1d6b6bfda5a94c13dc386da3cc6 100644
--- a/chrome/browser/component_updater/component_updater_configurator.cc
+++ b/chrome/browser/component_updater/component_updater_configurator.cc
@@ -11,7 +11,10 @@
 #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"
@@ -101,6 +104,10 @@ class ChromeConfigurator : public Configurator {
   virtual int OnDemandDelay() const OVERRIDE;
   virtual GURL UpdateUrl() const OVERRIDE;
   virtual GURL PingUrl() const OVERRIDE;
+  virtual base::Version GetBrowserVersion() const OVERRIDE;
+  virtual std::string GetChannel() 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;
@@ -183,6 +190,22 @@ GURL ChromeConfigurator::PingUrl() const {
   return pings_enabled_ ? GURL(kPingUrl) : GURL();
 }
 
+base::Version ChromeConfigurator::GetBrowserVersion() const {
+  return base::Version(chrome::VersionInfo().Version());
+}
+
+std::string ChromeConfigurator::GetChannel() 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_;
 }