Add a function to get the processor architecture. I will be using this in the user agent construction code.
Also cleans up a few nearby things.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6632002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76945 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/memory_details_win.cc b/chrome/browser/memory_details_win.cc
index edb53c8..f6548fe 100644
--- a/chrome/browser/memory_details_win.cc
+++ b/chrome/browser/memory_details_win.cc
@@ -11,6 +11,7 @@
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "base/win/scoped_handle.h"
+#include "base/win/win_util.h"
#include "base/win/windows_version.h"
#include "chrome/common/chrome_version_info.h"
#include "chrome/common/url_constants.h"
@@ -72,10 +73,8 @@
for (unsigned int index = 0; index < process_data_.size(); index++)
process_data_[index].processes.clear();
- SYSTEM_INFO system_info;
- GetNativeSystemInfo(&system_info);
- bool is_64bit_os =
- system_info.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64;
+ base::win::WindowsArchitecture windows_architecture =
+ base::win::GetWindowsArchitecture();
base::win::ScopedHandle snapshot(
::CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0));
@@ -94,7 +93,9 @@
PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, pid));
if (!process_handle.Get())
continue;
- bool is_64bit_process = is_64bit_os &&
+ bool is_64bit_process =
+ ((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++) {
