Revert of Add Windows 10 build number to user-agent

content/common/user_agent.cc

Index: content/common/user_agent.cc
diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc
index ee6e9011412f3407b627fcc82b57250db77c4deb..5602261f68182583cd7840e983558b86d096bb0c 100644
--- a/content/common/user_agent.cc
+++ b/content/common/user_agent.cc
@@ -63,15 +63,6 @@
 #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) {
@@ -117,8 +108,9 @@
   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",