Do Keychain reauthorization at update time

chrome/browser/mac/keychain_reauthorize.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/mac/keychain_reauthorize.h"
 
 #import <Foundation/Foundation.h>
 #include <Security/Security.h>
 
 #include <algorithm>
@@ skipping 110 matching lines @@
   WriteKCItemsAndReauthorizedAccesses(items_and_reauthorized_accesses);
 }
 
 void KeychainReauthorizeIfNeeded(NSString* pref_key, int max_tries) {
   NSUserDefaults* user_defaults = [NSUserDefaults standardUserDefaults];
   int pref_value = [user_defaults integerForKey:pref_key];
 
   if (pref_value < max_tries) {
     if (pref_value > 0) {
       // Logs the number of previous tries that didn't complete.
-      UMA_HISTOGRAM_COUNTS("OSX.KeychainReauthorizeIfNeeded", pref_value);
+      if (base::mac::AmIBundled()) {
+        UMA_HISTOGRAM_COUNTS("OSX.KeychainReauthorizeIfNeeded", pref_value);
+      } else {
+        UMA_HISTOGRAM_COUNTS("OSX.KeychainReauthorizeIfNeededAtUpdate",
+                             pref_value);
+      }
     }
 
     ++pref_value;
     [user_defaults setInteger:pref_value forKey:pref_key];
     [user_defaults synchronize];
 
     chrome::browser::mac::KeychainReauthorize();
 
     [user_defaults setInteger:max_tries forKey:pref_key];
     NSString* success_pref_key = [pref_key stringByAppendingString:@"Success"];
     [user_defaults setBool:YES forKey:success_pref_key];
     [user_defaults synchronize];
 
     // Logs the try number (1, 2) that succeeded.
-    UMA_HISTOGRAM_COUNTS("OSX.KeychainReauthorizeIfNeededSuccess", pref_value);
+    if (base::mac::AmIBundled()) {
+      UMA_HISTOGRAM_COUNTS("OSX.KeychainReauthorizeIfNeededSuccess",
+                           pref_value);
+    } else {
+      UMA_HISTOGRAM_COUNTS("OSX.KeychainReauthorizeIfNeededAtUpdateSuccess",
+                           pref_value);
+    }
   }
 }
 
 namespace {
 
 std::vector<std::string> RequirementMatches() {
   // See the designated requirement for a signed released build:
   // codesign -d -r- "Google Chrome.app"
   //
   // Export the certificates from a signed released build:
@@ skipping 303 matching lines @@
   }
 
   return new_attributes;
 }
 
 }  // namespace
 
 }  // namespace mac
 }  // namespace browser
 }  // namespace chrome