Implement SysInfo::CPUArchitecture() on Windows.

base/sys_info.h

 // Copyright (c) 2012 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.
 
 #ifndef BASE_SYS_INFO_H_
 #define BASE_SYS_INFO_H_
 
+#include <string>
+
 #include "base/base_export.h"
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/time.h"
-
-#include <string>
-
-class FilePath;
+#include "build/build_config.h"
 
 namespace base {
 
 class BASE_EXPORT SysInfo {
  public:
   // Return the number of logical processors/cores on the current machine.
   static int NumberOfProcessors();
 
   // Return the number of bytes of physical memory on the current machine.
   static int64 AmountOfPhysicalMemory();
@@ skipping 18 matching lines @@
   // corresponding unit test.
   // DON'T USE THIS ON THE MAC OR WINDOWS to determine the current OS release
   // for OS version-specific feature checks and workarounds. If you must use
   // an OS version check instead of a feature check, use the base::mac::IsOS*
   // family from base/mac/mac_util.h, or base::win::GetVersion from
   // base/win/windows_version.h.
   static void OperatingSystemVersionNumbers(int32* major_version,
                                             int32* minor_version,
                                             int32* bugfix_version);
 
-  // Returns the CPU architecture of the system. Exact return value may differ
-  // across platforms.
+  // Returns the architecture of the running operating system.
+  // Exact return value may differ across platforms.
+  // e.g. a 32-bit x86 kernel on a 64-bit capable CPU will return "x86",
+  //      whereas a x86-64 kernel on the same CPU will return "x86_64"
+  // TODO(thestig) Rename this to OperatingSystemArchitecture().
   static std::string CPUArchitecture();
 
+  // Avoid using this. Use base/cpu.h to get information about the CPU instead.
+  // http://crbug.com/148884
   // Returns the CPU model name of the system. If it can not be figured out,
   // an empty string is returned.
   static std::string CPUModelName();
 
   // Return the smallest amount of memory (in bytes) which the VM system will
   // allocate.
   static size_t VMAllocationGranularity();
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
   // Returns the maximum SysV shared memory segment size.
   static size_t MaxSharedMemorySize();
-#endif // defined(OS_POSIX) && !defined(OS_MACOSX)
+#endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
 
 #if defined(OS_CHROMEOS)
   // Returns the name of the version entry we wish to look up in the
   // Linux Standard Base release information file.
   static std::string GetLinuxStandardBaseVersionKey();
 
   // Parses /etc/lsb-release to get version information for Google Chrome OS.
   // Declared here so it can be exposed for unit testing.
   static void ParseLsbRelease(const std::string& lsb_release,
                               int32* major_version,
                               int32* minor_version,
                               int32* bugfix_version);
 
   // Returns the path to the lsb-release file.
   static FilePath GetLsbReleaseFilePath();
-#endif // defined(OS_CHROMEOS)
+#endif  // defined(OS_CHROMEOS)
 
 #if defined(OS_ANDROID)
   // Returns the Android build's codename.
   static std::string GetAndroidBuildCodename();
 
   // Returns the Android build ID.
   static std::string GetAndroidBuildID();
 
   // Returns the device's name.
   static std::string GetDeviceName();
 
   static int DalvikHeapSizeMB();
-#endif // defined(OS_ANDROID)
+#endif  // defined(OS_ANDROID)
 };
 
 }  // namespace base
 
 #endif  // BASE_SYS_INFO_H_