Rename MacKeychain to AppleKeychain

chrome/browser/password_manager/encryptor_password_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/password_manager/encryptor_password_mac.h"
 
 #import <Security/Security.h>
 
 #include "base/base64.h"
 #include "base/mac/mac_logging.h"
 #include "base/rand_util.h"
-#include "crypto/keychain_mac.h"
+#include "crypto/apple_keychain.h"
 #include "ui/base/l10n/l10n_util.h"
 
-using crypto::MacKeychain;
+using crypto::AppleKeychain;
 
 namespace {
 
 // Generates a random password and adds it to the Keychain.  The added password
 // is returned from the function.  If an error occurs, an empty password is
 // returned.
-std::string AddRandomPasswordToKeychain(const MacKeychain& keychain,
+std::string AddRandomPasswordToKeychain(const AppleKeychain& keychain,
                                         const std::string& service_name,
                                         const std::string& account_name) {
   // Generate a password with 128 bits of randomness.
   const int kBytes = 128 / 8;
   std::string password;
   base::Base64Encode(base::RandBytesAsString(kBytes), &password);
   void* password_data =
       const_cast<void*>(static_cast<const void*>(password.data()));
 
   OSStatus error = keychain.AddGenericPassword(NULL,
@@ skipping 38 matching lines @@
         std::string(static_cast<char*>(password_data), password_length);
     keychain_.ItemFreeContent(NULL, password_data);
     return password;
   } else if (error == errSecItemNotFound) {
     return AddRandomPasswordToKeychain(keychain_, service_name, account_name);
   } else {
     OSSTATUS_DLOG(ERROR, error) << "Keychain lookup failed";
     return std::string();
   }
 }