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

chrome/browser/component_updater/component_updater_utils.cc

Index: chrome/browser/component_updater/component_updater_utils.cc
===================================================================
--- chrome/browser/component_updater/component_updater_utils.cc	(revision 242136)
+++ chrome/browser/component_updater/component_updater_utils.cc	(working copy)
@@ -9,6 +9,7 @@
 #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"
@@ -22,7 +23,8 @@
                                  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\"?>"
@@ -119,6 +121,10 @@
   }
 }
 
+bool HasDiffUpdate(const CrxUpdateItem* update_item) {
+  return !update_item->crx_diffurls.empty();
+}
+
 bool IsHttpServerError(int status_code) {
   return 500 <= status_code && status_code < 600;
 }