Component updater: report the Windows OS and Service Pack separately.

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 48 matching lines @@
     } else {
       id.append(1, 'a');
     }
   }
 
   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);
+#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();
+#endif
+}
+
 }  // namespace
 
 std::string BuildProtocolRequest(const std::string& prod_id,
                                  const std::string& browser_version,
                                  const std::string& channel,
                                  const std::string& lang,
                                  const std::string& os_long_name,
                                  const std::string& download_preference,
                                  const std::string& request_body,
                                  const std::string& additional_attributes) {
@@ skipping 29 matching lines @@
   if (!download_preference.empty())
     base::StringAppendF(&request, " dlpref=\"%s\"",
                         download_preference.c_str());
   base::StringAppendF(&request, ">");
 
   // HW platform information.
   base::StringAppendF(&request, "<hw physmemory=\"%d\"/>",
                       GetPhysicalMemoryGB());  // "physmem" in GB.
 
   // OS version and platform information.
+  const std::string os_version = GetOSVersion();
+  const std::string os_sp = GetServicePack();
+
   base::StringAppendF(
-      &request, "<os platform=\"%s\" version=\"%s\" arch=\"%s\"/>",
+      &request, "<os platform=\"%s\" arch=\"%s\"",
       os_long_name.c_str(),                                    // "platform"
-      base::SysInfo().OperatingSystemVersion().c_str(),        // "version"
       base::SysInfo().OperatingSystemArchitecture().c_str());  // "arch"
+  if (!os_version.empty())
+    base::StringAppendF(&request, " version=\"%s\"", os_version.c_str());
+  if (!os_sp.empty())
+    base::StringAppendF(&request, " sp=\"%s\"", os_sp.c_str());
+  base::StringAppendF(&request, "/>");
 
   // The actual payload of the request.
   base::StringAppendF(&request, "%s</request>", request_body.c_str());
 
   return request;
 }
 
 std::unique_ptr<net::URLFetcher> SendProtocolRequest(
     const GURL& url,
     const std::string& protocol_request,
@@ skipping 144 matching lines @@
 
 void RemoveUnsecureUrls(std::vector<GURL>* urls) {
   DCHECK(urls);
   urls->erase(std::remove_if(
                   urls->begin(), urls->end(),
                   [](const GURL& url) { return !url.SchemeIsCryptographic(); }),
               urls->end());
 }
 
 }  // namespace update_client