Remove keychain_reauthorize

chrome/browser/chrome_browser_main_mac.mm

Index: chrome/browser/chrome_browser_main_mac.mm
diff --git a/chrome/browser/chrome_browser_main_mac.mm b/chrome/browser/chrome_browser_main_mac.mm
index 9539309df575f6aece9e39918d65c81c0d2f39ac..cf8a1aedc240cd32a5eec8299e09b8ca9a89bf8a 100644
--- a/chrome/browser/chrome_browser_main_mac.mm
+++ b/chrome/browser/chrome_browser_main_mac.mm
@@ -18,7 +18,6 @@
 #include "chrome/browser/browser_process.h"
 #import "chrome/browser/chrome_browser_application_mac.h"
 #include "chrome/browser/mac/install_from_dmg.h"
-#include "chrome/browser/mac/keychain_reauthorize.h"
 #import "chrome/browser/mac/keystone_glue.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/common/chrome_paths.h"
@@ -32,17 +31,6 @@
 
 namespace {
 
-// Some users rarely restart Chrome, so they might never get a chance to run
-// the at-launch KeychainReauthorize. To account for them, there's also an
-// at-update KeychainReauthorize option, which runs from .keystone_install for
-// users on a user Keystone ticket. This operation may make sense for a period
-// of time after the application switches to being signed by the new
-// certificate, as long as the at-update stub executable is still signed by
-// the old one.
-NSString* const kKeychainReauthorizeAtUpdatePref =
-    @"KeychainReauthorizeAtUpdateMay2012";
-const int kKeychainReauthorizeAtUpdateMaxTries = 3;
-
 // This is one enum instead of two so that the values can be correlated in a
 // histogram.
 enum CatSixtyFour {
@@ -162,25 +150,6 @@ ChromeBrowserMainPartsMac::~ChromeBrowserMainPartsMac() {
 }
 
 void ChromeBrowserMainPartsMac::PreEarlyInitialization() {
-  if (parsed_command_line().HasSwitch(switches::kKeychainReauthorize)) {
-    if (base::mac::AmIBundled()) {
-      LOG(FATAL) << "Inappropriate process type for Keychain reauthorization";
-    }
-
-    // Do Keychain reauthorization at the time of update installation. This
-    // gets three chances to run. If the first or second try doesn't complete
-    // successfully (crashes or is interrupted for any reason), there will be
-    // another chance. Once this step completes successfully, it should never
-    // have to run again.
-    //
-    // This is kicked off by a special stub executable during an automatic
-    // update. See chrome/installer/mac/keychain_reauthorize_main.cc.
-    chrome::KeychainReauthorizeIfNeeded(kKeychainReauthorizeAtUpdatePref,
-                                        kKeychainReauthorizeAtUpdateMaxTries);
-
-    exit(0);
-  }
-
   ChromeBrowserMainPartsPosix::PreEarlyInitialization();
 
   if (base::mac::WasLaunchedAsHiddenLoginItem()) {