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

chrome/browser/component_updater/component_updater_utils.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_utils.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/guid.h"
 #include "base/strings/stringprintf.h"
 #include "base/sys_info.h"
 #include "base/win/windows_version.h"
+#include "chrome/browser/component_updater/crx_update_item.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/omaha_query_params/omaha_query_params.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 
 namespace component_updater {
 
 std::string BuildProtocolRequest(const std::string& request_body,
                                  const std::string& additional_attributes) {
   const std::string prod_id(chrome::OmahaQueryParams::GetProdIdString(
       chrome::OmahaQueryParams::CHROME));
-  const std::string chrome_version(chrome::VersionInfo().Version().c_str());
+  const chrome::VersionInfo chrome_version_info;
+  const std::string chrome_version(chrome_version_info.Version());
 
   std::string request(
       "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
       "<request protocol=\"3.0\" ");
 
   if (!additional_attributes.empty())
      base::StringAppendF(&request, "%s ", additional_attributes.c_str());
 
   // Chrome version and platform information.
   base::StringAppendF(
@@ skipping 76 matching lines @@
       // Network errors are small negative numbers.
       const int error = fetcher.GetStatus().error();
       return error ? error : -1;
     }
 
     default:
       return -1;
   }
 }
 
+bool HasDiffUpdate(const CrxUpdateItem* update_item) {
+  return !update_item->crx_diffurls.empty();
+}
+
 bool IsHttpServerError(int status_code) {
   return 500 <= status_code && status_code < 600;
 }
 
 bool DeleteFileAndEmptyParentDirectory(const base::FilePath& filepath) {
   if (!base::DeleteFile(filepath, false))
     return false;
 
   const base::FilePath dirname(filepath.DirName());
   if (!base::IsDirectoryEmpty(dirname))
     return true;
 
   return base::DeleteFile(dirname, false);
 }
 
 }  // namespace component_updater