Report Windows build and patch number in the component updater checks.

components/update_client/utils.cc

 // Copyright 2014 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 "components/update_client/utils.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 14 matching lines @@
 #include "base/sys_info.h"
 #include "base/win/windows_version.h"
 #include "build/build_config.h"
 #include "components/crx_file/id_util.h"
 #include "components/update_client/configurator.h"
 #include "components/update_client/crx_update_item.h"
 #include "components/update_client/update_client.h"
 #include "components/update_client/update_client_errors.h"
 #include "components/update_client/update_query_params.h"
 #include "components/update_client/updater_state.h"
+#include "components/update_client/utils_win.h"
 #include "crypto/secure_hash.h"
 #include "crypto/sha2.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"
 #include "url/gurl.h"
 
 namespace update_client {
 
@@ skipping 20 matching lines @@
     }
   }
 
   DCHECK(crx_file::id_util::IdIsValid(id));
 
   return id;
 }
 
 std::string GetOSVersion() {
 #if defined(OS_WIN)
-  int32_t major = 0;
-  int32_t minor = 0;
-  int32_t bugfix = 0;
-  base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &bugfix);
-  return base::StringPrintf("%d.%d.%d", major, minor, bugfix);
+  return GetWindowsOSVersion();
 #else
   return base::SysInfo().OperatingSystemVersion();
 #endif
 }
 
 std::string GetServicePack() {
 #if defined(OS_WIN)
   return base::win::OSInfo::GetInstance()->service_pack_str();
 #else
   return std::string();
@@ skipping 245 matching lines @@
                   [](const GURL& url) { return !url.SchemeIsCryptographic(); }),
               urls->end());
 }
 
 CrxInstaller::Result InstallFunctionWrapper(base::Callback<bool()> callback) {
   return CrxInstaller::Result(callback.Run() ? InstallError::NONE
                                              : InstallError::GENERIC_ERROR);
 }
 
 }  // namespace update_client