Index: chrome/browser/component_updater/pnacl/pnacl_component_installer.cc |
diff --git a/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc b/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc |
index ea4ec898e0555c4714be8b70350593b2a898fead..d4a461f7bf2a495118358bf06a39acff28ab671b 100644 |
--- a/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc |
+++ b/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc |
@@ -50,14 +50,14 @@ const char kPnaclManifestName[] = "PNaCl"; |
const char* PnaclArch() { |
#if defined(ARCH_CPU_X86_FAMILY) |
#if defined(ARCH_CPU_X86_64) |
- bool x86_64 = true; |
+ return "x86-64"; |
#elif defined(OS_WIN) |
bool x86_64 = (base::win::OSInfo::GetInstance()->wow64_status() == |
base::win::OSInfo::WOW64_ENABLED); |
+ return x86_64 ? "x86-64" : "x86-32"; |
#else |
- bool x86_64 = false; |
+ return "x86-32"; |
#endif |
- return x86_64 ? "x86-64" : "x86-32"; |
#elif defined(ARCH_CPU_ARMEL) |
// Eventually we'll need to distinguish arm32 vs thumb2. |
// That may need to be based on the actual nexe rather than a static |