In-app messaging to communicate the imminent 32-bit deprecation to 32-bit-only users

chrome/browser/mac/keystone_glue.mm

Index: chrome/browser/mac/keystone_glue.mm
diff --git a/chrome/browser/mac/keystone_glue.mm b/chrome/browser/mac/keystone_glue.mm
index dea4bb4845266aed424137134d01ae1a717b70ea..bbbbb7bbe6b106901dd0f7eb08c3d263bfd6c5e2 100644
--- a/chrome/browser/mac/keystone_glue.mm
+++ b/chrome/browser/mac/keystone_glue.mm
@@ -7,8 +7,6 @@
 #include <sys/mount.h>
 #include <sys/param.h>
 #include <sys/stat.h>
-#include <sys/sysctl.h>
-#include <sys/types.h>
 
 #include <vector>
 
@@ -26,6 +24,7 @@
 #include "base/threading/worker_pool.h"
 #include "build/build_config.h"
 #import "chrome/browser/mac/keystone_registration.h"
+#include "chrome/browser/mac/system_bitness.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_version_info.h"
 #include "grit/chromium_strings.h"
@@ -191,9 +190,6 @@ class PerformBridge : public base::RefCountedThreadSafe<PerformBridge> {
 // Returns the brand file path to use for Keystone.
 - (NSString*)brandFilePath;
 
-// YES if the system's CPU is 32-bit-only, NO if it's 64-bit-capable.
-- (BOOL)has32BitOnlyCPU;
-
 // YES if no update installation has succeeded since a binary diff patch
 // installation failed. This signals the need to attempt a full installer
 // which does not depend on applying a patch to existing files.
@@ -1009,19 +1005,6 @@ NSString* const kVersionKey = @"KSVersion";
   }
 }
 
-- (BOOL)has32BitOnlyCPU {
-#if defined(ARCH_CPU_64_BITS)
-  return NO;
-#else  // ARCH_CPU_64_BITS
-  int value;
-  size_t valueSize = sizeof(value);
-  if (sysctlbyname("hw.cpu64bit_capable", &value, &valueSize, NULL, 0) != 0) {
-    return YES;
-  }
-  return value == 0;
-#endif  // ARCH_CPU_64_BITS
-}
-
 - (BOOL)wantsFullInstaller {
   // It's difficult to check the tag prior to Keystone registration, and
   // performing registration replaces the tag. keystone_install.sh
@@ -1053,7 +1036,7 @@ NSString* const kVersionKey = @"KSVersion";
   // Info.plist, tag suffix components should only be appended to the tag
   // suffix in ASCII sort order.
   NSString* tagSuffix = @"";
-  if ([self has32BitOnlyCPU]) {
+  if (chrome::Has32BitOnlyCPU()) {
     tagSuffix = [tagSuffix stringByAppendingString:@"-32bit"];
   }
   if ([self wantsFullInstaller]) {