Componentize component_updater: Use Configurator to build query parameters.

chrome/browser/component_updater/component_updater_ping_manager.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/component_updater/component_updater_ping_manager.h"
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/guid.h"
@@ skipping 22 matching lines @@
       return "unknown";
   }
 }
 
 // Sends a fire and forget ping. The instances of this class have no
 // ownership and they self-delete upon completion.
 class PingSender : public net::URLFetcherDelegate {
  public:
   PingSender();
 
-  void SendPing(const GURL& ping_url,
+  void SendPing(const Configurator& config,
                 net::URLRequestContextGetter* url_request_context_getter,
                 const CrxUpdateItem* item);
 
  private:
   virtual ~PingSender();
 
   // Overrides for URLFetcherDelegate.
   virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
 
-  static std::string BuildPing(const CrxUpdateItem* item);
+  static std::string BuildPing(const Configurator& config,
+                               const CrxUpdateItem* item);
   static std::string BuildDownloadCompleteEventElements(
       const CrxUpdateItem* item);
   static std::string BuildUpdateCompleteEventElement(const CrxUpdateItem* item);
 
   scoped_ptr<net::URLFetcher> url_fetcher_;
 
   DISALLOW_COPY_AND_ASSIGN(PingSender);
 };
 
 PingSender::PingSender() {
 }
 
 PingSender::~PingSender() {
 }
 
 void PingSender::OnURLFetchComplete(const net::URLFetcher* source) {
   delete this;
 }
 
 void PingSender::SendPing(
-    const GURL& ping_url,
+    const Configurator& config,
     net::URLRequestContextGetter* url_request_context_getter,
     const CrxUpdateItem* item) {
   DCHECK(item);
 
-  if (!ping_url.is_valid())
+  if (!config.PingUrl().is_valid())
     return;
 
   url_fetcher_.reset(SendProtocolRequest(
-      ping_url, BuildPing(item), this, url_request_context_getter));
+      config.PingUrl(), BuildPing(config, item), this,
+      url_request_context_getter));
 }
 
 // Builds a ping message for the specified update item.
-std::string PingSender::BuildPing(const CrxUpdateItem* item) {
+std::string PingSender::BuildPing(const Configurator& config,
+                                  const CrxUpdateItem* item) {
   const char app_element_format[] =
       "<app appid=\"%s\" version=\"%s\" nextversion=\"%s\">"
       "%s"
       "%s"
       "</app>";
   const std::string app_element(base::StringPrintf(
       app_element_format,
       item->id.c_str(),                                    // "appid"
       item->previous_version.GetString().c_str(),          // "version"
       item->next_version.GetString().c_str(),              // "nextversion"
       BuildUpdateCompleteEventElement(item).c_str(),       // update event
       BuildDownloadCompleteEventElements(item).c_str()));  // download events
 
-  return BuildProtocolRequest(app_element, "");
+  return BuildProtocolRequest(config.GetBrowserVersion().GetString(),
+                              config.GetChannel(), config.GetLang(),

[Sorin Jianu, 2014/07/10 16:25:23]

small nit, maybe align vertically the arguments, since in this case they appear
to run together. Here and at one more call site.

[tommycli, 2014/07/10 17:46:36]

Done.

+                              config.GetOSLongName(), app_element, "");
 }
 
 // Returns a string representing a sequence of download complete events
 // corresponding to each download metrics in |item|.
 std::string PingSender::BuildDownloadCompleteEventElements(
     const CrxUpdateItem* item) {
   using base::StringAppendF;
   std::string download_events;
   for (size_t i = 0; i != item->download_metrics.size(); ++i) {
     const CrxDownloader::DownloadMetrics& metrics = item->download_metrics[i];
@@ skipping 71 matching lines @@
 PingManager::PingManager(const Configurator& config) : config_(config) {
 }
 
 PingManager::~PingManager() {
 }
 
 // Sends a fire and forget ping when the updates are complete. The ping
 // sender object self-deletes after sending the ping.
 void PingManager::OnUpdateComplete(const CrxUpdateItem* item) {
   PingSender* ping_sender(new PingSender);
-  ping_sender->SendPing(config_.PingUrl(), config_.RequestContext(), item);
+  ping_sender->SendPing(config_, config_.RequestContext(), item);
 }
 
 }  // namespace component_updater