Rename MacKeychain to AppleKeychain

chrome/browser/password_manager/encryptor_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.h"
 
 #include <CommonCrypto/CommonCryptor.h>  // for kCCBlockSizeAES128
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/password_manager/encryptor_password_mac.h"
+#include "crypto/apple_keychain.h"
 #include "crypto/encryptor.h"
-#include "crypto/keychain_mac.h"
 #include "crypto/symmetric_key.h"
 
-using crypto::MacKeychain;
+using crypto::AppleKeychain;
 
 namespace {
 
 // Salt for Symmetric key derivation.
 const char kSalt[] = "saltysalt";
 
 // Key size required for 128 bit AES.
 const size_t kDerivedKeySizeInBits = 128;
 
 // Constant for Symmetic key derivation.
@@ skipping 10 matching lines @@
 // Generates a newly allocated SymmetricKey object based on the password found
 // in the Keychain.  The generated key is for AES encryption.  Ownership of the
 // key is passed to the caller.  Returns NULL key in the case password access
 // is denied or key generation error occurs.
 crypto::SymmetricKey* GetEncryptionKey() {
 
   std::string password;
   if (use_mock_keychain) {
     password = "mock_password";
   } else {
-    MacKeychain keychain;
+    AppleKeychain keychain;
     EncryptorPassword encryptor_password(keychain);
     password = encryptor_password.GetEncryptorPassword();
   }
 
   if (password.empty())
     return NULL;
 
   std::string salt(kSalt);
 
   // Create an encryption key from our password and salt.
@@ skipping 82 matching lines @@
   if (!encryptor.Decrypt(raw_ciphertext, plaintext))
     return false;
 
   return true;
 }
 
 void Encryptor::UseMockKeychain(bool use_mock) {
   use_mock_keychain = use_mock;
 }