Revert of Add Windows 10 build number to user-agent

content/common/user_agent.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 "content/public/common/user_agent.h"
 
 #include <stdint.h>
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
@@ skipping 45 matching lines @@
   // special case for biarch systems
   if (strcmp(unixinfo.machine, "x86_64") == 0 &&
       sizeof(void*) == sizeof(int32_t)) {  // NOLINT
     cputype.assign("i686 (x86_64)");
   } else {
     cputype.assign(unixinfo.machine);
   }
 #endif
 
 #if defined(OS_WIN)
-  std::string windows_version_str;
-  if (os_major_version >= 10) {
-    base::StringAppendF(&windows_version_str, "%d.%d.%d",
-      os_major_version, os_minor_version, os_bugfix_version);
-  } else {
-    base::StringAppendF(
-      &windows_version_str, "%d.%d", os_major_version, os_minor_version);
-  }
-
   std::string architecture_token;
   base::win::OSInfo* os_info = base::win::OSInfo::GetInstance();
   if (os_info->wow64_status() == base::win::OSInfo::WOW64_ENABLED) {
     architecture_token = "; WOW64";
   } else {
     base::win::OSInfo::WindowsArchitecture windows_architecture =
         os_info->architecture();
     if (windows_architecture == base::win::OSInfo::X64_ARCHITECTURE)
       architecture_token = "; Win64; x64";
     else if (windows_architecture == base::win::OSInfo::IA64_ARCHITECTURE)
@@ skipping 25 matching lines @@
     if (!semicolon_inserted) {
       android_info_str += ";";
     }
     android_info_str += " Build/" + android_build_id;
   }
 #endif
 
   base::StringAppendF(
       &os_cpu,
 #if defined(OS_WIN)
-      "Windows NT %s%s",
-      windows_version_str.c_str(),
+      "Windows NT %d.%d%s",
+      os_major_version,
+      os_minor_version,
       architecture_token.c_str()
 #elif defined(OS_MACOSX)
       "Intel Mac OS X %d_%d_%d",
       os_major_version,
       os_minor_version,
       os_bugfix_version
 #elif defined(OS_CHROMEOS)
       "CrOS "
       "%s %d.%d.%d",
       cputype.c_str(),   // e.g. i686
@@ skipping 64 matching lines @@
       os_info.c_str(),
       WEBKIT_VERSION_MAJOR,
       WEBKIT_VERSION_MINOR,
       product.c_str(),
       WEBKIT_VERSION_MAJOR,
       WEBKIT_VERSION_MINOR);
   return user_agent;
 }
 
 }  // namespace content