Revert 80819 due to failed tests

webkit/glue/user_agent.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 "webkit/glue/user_agent.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include <sys/utsname.h>
 #endif
 
 #include "base/string_util.h"
@@ skipping 45 matching lines @@
   if (strcmp(unixinfo.machine, "x86_64") == 0 &&
       sizeof(void*) == sizeof(int32)) {  // NOLINT
     cputype.assign("i686 (x86_64)");
   } else {
     cputype.assign(unixinfo.machine);
   }
 #endif
 
 #if defined(OS_WIN)
   std::string architecture_token;
-  base::win::OSInfo* os_info = base::win::OSInfo::GetInstance();
-  if (os_info->wow64_status() == base::win::OSInfo::WOW64_ENABLED) {
+  if (base::win::GetWOW64Status() == base::win::WOW64_ENABLED) {
     architecture_token = "; WOW64";
   } else {
-    base::win::OSInfo::WindowsArchitecture windows_architecture =
-        os_info->architecture();
-    if (windows_architecture == base::win::OSInfo::X64_ARCHITECTURE)
+    base::win::WindowsArchitecture windows_architecture =
+        base::win::GetWindowsArchitecture();
+    if (windows_architecture == base::win::X64_ARCHITECTURE)
       architecture_token = "; Win64; x64";
-    else if (windows_architecture == base::win::OSInfo::IA64_ARCHITECTURE)
+    else if (windows_architecture == base::win::IA64_ARCHITECTURE)
       architecture_token = "; Win64; IA64";
   }
 #endif
 
   base::StringAppendF(
       &os_cpu,
 #if defined(OS_WIN)
       "Windows NT %d.%d%s",
       os_major_version,
       os_minor_version,
@@ skipping 49 matching lines @@
       BuildOSCpuInfo().c_str(),
       WEBKIT_VERSION_MAJOR,
       WEBKIT_VERSION_MINOR,
       product.c_str(),
       WEBKIT_VERSION_MAJOR,
       WEBKIT_VERSION_MINOR);
 }
 
 }  // namespace webkit_glue