Rename components's Encryptor to OSEncrypt.

components/encryptor/os_crypt_mac.mm

 // Copyright 2014 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 "components/encryptor/encryptor.h"
+#include "components/encryptor/os_crypt.h"
 
 #include <CommonCrypto/CommonCryptor.h>  // for kCCBlockSizeAES128
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/encryptor/encryptor_password_mac.h"
 #include "components/encryptor/encryptor_switches.h"
+#include "components/encryptor/keychain_password_mac.h"
 #include "crypto/apple_keychain.h"
 #include "crypto/encryptor.h"
 #include "crypto/symmetric_key.h"
 
 using crypto::AppleKeychain;
 
 namespace {
 
 // Salt for Symmetric key derivation.
 const char kSalt[] = "saltysalt";
@@ skipping 19 matching lines @@
 crypto::SymmetricKey* GetEncryptionKey() {
   static bool mock_keychain_command_line_flag =
       CommandLine::ForCurrentProcess()->HasSwitch(
           encryptor::switches::kUseMockKeychain);
 
   std::string password;
   if (use_mock_keychain || mock_keychain_command_line_flag) {
     password = "mock_password";
   } else {
     AppleKeychain keychain;
-    EncryptorPassword encryptor_password(keychain);
-    password = encryptor_password.GetEncryptorPassword();
+    KeychainPassword encryptor_password(keychain);
+    password = encryptor_password.GetPassword();
   }
 
   if (password.empty())
     return NULL;
 
   std::string salt(kSalt);
 
   // Create an encryption key from our password and salt.
   scoped_ptr<crypto::SymmetricKey> encryption_key(
       crypto::SymmetricKey::DeriveKeyFromPassword(crypto::SymmetricKey::AES,
                                                   password,
                                                   salt,
                                                   kEncryptionIterations,
                                                   kDerivedKeySizeInBits));
   DCHECK(encryption_key.get());
 
   return encryption_key.release();
 }
 
 }  // namespace
 
-bool Encryptor::EncryptString16(const base::string16& plaintext,
-                                std::string* ciphertext) {
+bool OSCrypt::EncryptString16(const base::string16& plaintext,
+                              std::string* ciphertext) {
   return EncryptString(base::UTF16ToUTF8(plaintext), ciphertext);
 }
 
-bool Encryptor::DecryptString16(const std::string& ciphertext,
-                                base::string16* plaintext) {
+bool OSCrypt::DecryptString16(const std::string& ciphertext,
+                              base::string16* plaintext) {
   std::string utf8;
   if (!DecryptString(ciphertext, &utf8))
     return false;
 
   *plaintext = base::UTF8ToUTF16(utf8);
   return true;
 }
 
-bool Encryptor::EncryptString(const std::string& plaintext,
-                              std::string* ciphertext) {
+bool OSCrypt::EncryptString(const std::string& plaintext,
+                            std::string* ciphertext) {
   if (plaintext.empty()) {
     *ciphertext = std::string();
     return true;
   }
 
   scoped_ptr<crypto::SymmetricKey> encryption_key(GetEncryptionKey());
   if (!encryption_key.get())
     return false;
 
   std::string iv(kCCBlockSizeAES128, ' ');
   crypto::Encryptor encryptor;
   if (!encryptor.Init(encryption_key.get(), crypto::Encryptor::CBC, iv))
     return false;
 
   if (!encryptor.Encrypt(plaintext, ciphertext))
     return false;
 
   // Prefix the cypher text with version information.
   ciphertext->insert(0, kEncryptionVersionPrefix);
   return true;
 }
 
-bool Encryptor::DecryptString(const std::string& ciphertext,
-                              std::string* plaintext) {
+bool OSCrypt::DecryptString(const std::string& ciphertext,
+                            std::string* plaintext) {
   if (ciphertext.empty()) {
     *plaintext = std::string();
     return true;
   }
 
   // Check that the incoming cyphertext was indeed encrypted with the expected
   // version.  If the prefix is not found then we'll assume we're dealing with
   // old data saved as clear text and we'll return it directly.
   // Credit card numbers are current legacy data, so false match with prefix
   // won't happen.
@@ skipping 14 matching lines @@
   crypto::Encryptor encryptor;
   if (!encryptor.Init(encryption_key.get(), crypto::Encryptor::CBC, iv))
     return false;
 
   if (!encryptor.Decrypt(raw_ciphertext, plaintext))
     return false;
 
   return true;
 }
 
-void Encryptor::UseMockKeychain(bool use_mock) {
+void OSCrypt::UseMockKeychain(bool use_mock) {
   use_mock_keychain = use_mock;
 }