Implement SysInfo::CPUArchitecture() on Windows.

base/sys_info_win.cc

 // 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.
 
 #include "base/sys_info.h"
 
 #include <windows.h>
 
 #include "base/file_path.h"
 #include "base/logging.h"
@@ skipping 57 matching lines @@
   }
   return version;
 }
 
 // TODO: Implement OperatingSystemVersionComplete, which would include
 // patchlevel/service pack number.
 // See chrome/browser/feedback/feedback_util.h, FeedbackUtil::SetOSVersion.
 
 // static
 std::string SysInfo::CPUArchitecture() {
-  // TODO: Make this vary when we support any other architectures.
-  return "x86";
+  win::OSInfo::WindowsArchitecture arch =
+      win::OSInfo::GetInstance()->architecture();
+  switch (arch) {
+    case win::OSInfo::X86_ARCHITECTURE:
+      return "x86";
+    case win::OSInfo::X64_ARCHITECTURE:
+      return "x86_64";
+    case win::OSInfo::IA64_ARCHITECTURE:
+      return "ia64";
+    default:
+      return "";
+  }
 }
 
 // static
 std::string SysInfo::CPUModelName() {
   return win::OSInfo::GetInstance()->processor_model_name();
 }
 
 // static
 size_t SysInfo::VMAllocationGranularity() {
   return win::OSInfo::GetInstance()->allocation_granularity();
 }
 
 // static
 void SysInfo::OperatingSystemVersionNumbers(int32* major_version,
                                             int32* minor_version,
                                             int32* bugfix_version) {
   win::OSInfo* os_info = win::OSInfo::GetInstance();
   *major_version = os_info->version_number().major;
   *minor_version = os_info->version_number().minor;
   *bugfix_version = 0;
 }
 
 }  // namespace base