Revert 80819 due to failed tests

chrome/browser/memory_details_win.cc

 // Copyright (c) 2011 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 "chrome/browser/memory_details.h"
 
 #include <psapi.h>
 
 #include "base/file_path.h"
 #include "base/file_version_info.h"
@@ skipping 54 matching lines @@
 }
 
 void MemoryDetails::CollectProcessData(
     const std::vector<ProcessMemoryInformation>& child_info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   // Clear old data.
   for (unsigned int index = 0; index < process_data_.size(); index++)
     process_data_[index].processes.clear();
 
-  base::win::OSInfo::WindowsArchitecture windows_architecture =
-      base::win::OSInfo::GetInstance()->architecture();
+  base::win::WindowsArchitecture windows_architecture =
+      base::win::GetWindowsArchitecture();
 
   base::win::ScopedHandle snapshot(
       ::CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0));
   PROCESSENTRY32 process_entry = {sizeof(PROCESSENTRY32)};
   if (!snapshot.Get()) {
     LOG(ERROR) << "CreateToolhelp32Snaphot failed: " << GetLastError();
     return;
   }
   if (!::Process32First(snapshot, &process_entry)) {
     LOG(ERROR) << "Process32First failed: " << GetLastError();
     return;
   }
   do {
     base::ProcessId pid = process_entry.th32ProcessID;
     base::win::ScopedHandle process_handle(::OpenProcess(
         PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, pid));
     if (!process_handle.Get())
       continue;
     bool is_64bit_process =
-        ((windows_architecture == base::win::OSInfo::X64_ARCHITECTURE) ||
-         (windows_architecture == base::win::OSInfo::IA64_ARCHITECTURE)) &&
-        (base::win::OSInfo::GetWOW64StatusForProcess(process_handle) ==
-            base::win::OSInfo::WOW64_DISABLED);
+        ((windows_architecture == base::win::X64_ARCHITECTURE) ||
+         (windows_architecture == base::win::IA64_ARCHITECTURE)) &&
+        (base::win::GetWOW64StatusForProcess(process_handle) ==
+            base::win::WOW64_DISABLED);
     for (unsigned int index2 = 0; index2 < process_data_.size(); index2++) {
       if (_wcsicmp(process_data_[index2].process_name.c_str(),
                    process_entry.szExeFile) != 0)
         continue;
       if (index2 == IE_BROWSER && is_64bit_process)
         continue;  // Should use IE_64BIT_BROWSER
       // Get Memory Information.
       ProcessMemoryInformation info;
       info.pid = pid;
       if (info.pid == GetCurrentProcessId())
@@ skipping 41 matching lines @@
       }
       break;
     }
   } while (::Process32Next(snapshot, &process_entry));
 
   // Finally return to the browser thread.
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(this, &MemoryDetails::CollectChildInfoOnUIThread));
 }