Remove keychain_reauthorize

chrome/browser/chrome_browser_main_mac.mm

 // 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 "chrome/browser/chrome_browser_main_mac.h"
 
 #import <Cocoa/Cocoa.h>
 #include <sys/sysctl.h>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #import "chrome/browser/app_controller_mac.h"
 #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"
 #include "chrome/common/chrome_switches.h"
 #include "components/breakpad/app/breakpad_mac.h"
 #include "content/public/common/main_function_params.h"
 #include "content/public/common/result_codes.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/resource/resource_handle.h"
 
 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 {
   // Older than any expected cat.
   SABER_TOOTHED_CAT_32 = 0,
   SABER_TOOTHED_CAT_64,
 
   // Known cats.
   SNOW_LEOPARD_32,
   SNOW_LEOPARD_64,
@@ skipping 99 matching lines @@
 
 ChromeBrowserMainPartsMac::ChromeBrowserMainPartsMac(
     const content::MainFunctionParams& parameters)
     : ChromeBrowserMainPartsPosix(parameters) {
 }
 
 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()) {
     CommandLine* singleton_command_line = CommandLine::ForCurrentProcess();
     singleton_command_line->AppendSwitch(switches::kNoStartupWindow);
   }
 
   RecordCatSixtyFour();
 }
 
@@ skipping 83 matching lines @@
 void ChromeBrowserMainPartsMac::PostProfileInit() {
   ChromeBrowserMainPartsPosix::PostProfileInit();
   g_browser_process->metrics_service()->RecordBreakpadRegistration(
       breakpad::IsCrashReporterEnabled());
 }
 
 void ChromeBrowserMainPartsMac::DidEndMainMessageLoop() {
   AppController* appController = [NSApp delegate];
   [appController didEndMainMessageLoop];
 }