Merge 241734 "Added support for multiple urls in the component u..."

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 "base/guid.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/component_updater/component_updater_utils.h"
 #include "chrome/browser/component_updater/crx_update_item.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 
 namespace component_updater {
 
-// Returns true if the |update_item| contains a valid differential update url.
-bool HasDiffUpdate(const CrxUpdateItem* update_item) {
-  return update_item->diff_crx_url.is_valid();
-}
-
 // Returns a string literal corresponding to the value of the downloader |d|.
 const char* DownloaderToString(CrxDownloader::DownloadMetrics::Downloader d) {
   switch (d) {
     case CrxDownloader::DownloadMetrics::kUrlFetcher:
       return "direct";
     case CrxDownloader::DownloadMetrics::kBits:
       return "bits";
     default:
       return "unknown";
   }
@@ skipping 66 matching lines @@
 }
 
 // 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];
-    std::string event("<event eventtype=\"14\" ");
-    StringAppendF(&event, "eventresult=\"%d\"", metrics.error == 0);
+    std::string event("<event eventtype=\"14\"");
+    StringAppendF(&event, " eventresult=\"%d\"", metrics.error == 0);
     StringAppendF(&event,
                   " downloader=\"%s\"", DownloaderToString(metrics.downloader));
     if (metrics.error)
       StringAppendF(&event, " errorcode=\"%d\"", metrics.error);
     StringAppendF(&event, " url=\"%s\"", metrics.url.spec().c_str());
     if (metrics.bytes_downloaded) {
       StringAppendF(&event, " downloaded=\"%s\"",
                     base::Uint64ToString(metrics.bytes_downloaded).c_str());
     }
-    if (metrics.bytes_total)
+    if (metrics.bytes_total) {
       StringAppendF(&event, " total=\"%s\"",
                     base::Uint64ToString(metrics.bytes_total).c_str());
+    }
     if (metrics.download_time_ms) {
       StringAppendF(&event, " download_time_ms=\"%s\"",
                     base::Uint64ToString(metrics.download_time_ms).c_str());
     }
     StringAppendF(&event, "/>");
 
     download_events += event;
   }
   return download_events;
 }
@@ skipping 48 matching lines @@
 
 // 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) {
   component_updater::PingSender* ping_sender(new PingSender);
   ping_sender->SendPing(ping_url_, url_request_context_getter_, item);
 }
 
 }  // namespace component_updater