Rename components's Encryptor to OSEncrypt.

components/encryptor/keychain_password_mac_unittest.mm

Index: components/encryptor/keychain_password_mac_unittest.mm
diff --git a/components/encryptor/encryptor_password_mac_unittest.cc b/components/encryptor/keychain_password_mac_unittest.mm
similarity index 69%
rename from components/encryptor/encryptor_password_mac_unittest.cc
rename to components/encryptor/keychain_password_mac_unittest.mm
index bc95a4429b7241342d64c758e77b96779e6339d9..efa32b45cfc4c136259c94779d63ff5b0a996679 100644
--- a/components/encryptor/encryptor_password_mac_unittest.cc
+++ b/components/encryptor/keychain_password_mac_unittest.mm
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/encryptor/encryptor_password_mac.h"
+#include "components/encryptor/keychain_password_mac.h"
+
 #include "crypto/mock_apple_keychain.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -12,62 +13,62 @@ using crypto::MockAppleKeychain;
 
 // Test that if we have an existing password in the Keychain and we are
 // authorized by the user to read it then we get it back correctly.
-TEST(EncryptorPasswordTest, FindPasswordSuccess) {
+TEST(KeychainPasswordTest, FindPasswordSuccess) {
   MockAppleKeychain keychain;
   keychain.set_find_generic_result(noErr);
-  EncryptorPassword password(keychain);
-  EXPECT_FALSE(password.GetEncryptorPassword().empty());
+  KeychainPassword password(keychain);
+  EXPECT_FALSE(password.GetPassword().empty());
   EXPECT_FALSE(keychain.called_add_generic());
   EXPECT_EQ(0, keychain.password_data_count());
 }
 
 // Test that if we do not have an existing password in the Keychain then it
 // gets added successfully and returned.
-TEST(EncryptorPasswordTest, FindPasswordNotFound) {
+TEST(KeychainPasswordTest, FindPasswordNotFound) {
   MockAppleKeychain keychain;
   keychain.set_find_generic_result(errSecItemNotFound);
-  EncryptorPassword password(keychain);
-  EXPECT_EQ(24U, password.GetEncryptorPassword().length());
+  KeychainPassword password(keychain);
+  EXPECT_EQ(24U, password.GetPassword().length());
   EXPECT_TRUE(keychain.called_add_generic());
   EXPECT_EQ(0, keychain.password_data_count());
 }
 
 // Test that if get denied access by the user then we return an empty password.
 // And we should not try to add one.
-TEST(EncryptorPasswordTest, FindPasswordNotAuthorized) {
+TEST(KeychainPasswordTest, FindPasswordNotAuthorized) {
   MockAppleKeychain keychain;
   keychain.set_find_generic_result(errSecAuthFailed);
-  EncryptorPassword password(keychain);
-  EXPECT_TRUE(password.GetEncryptorPassword().empty());
+  KeychainPassword password(keychain);
+  EXPECT_TRUE(password.GetPassword().empty());
   EXPECT_FALSE(keychain.called_add_generic());
   EXPECT_EQ(0, keychain.password_data_count());
 }
 
 // Test that if some random other error happens then we return an empty
 // password, and we should not try to add one.
-TEST(EncryptorPasswordTest, FindPasswordOtherError) {
+TEST(KeychainPasswordTest, FindPasswordOtherError) {
   MockAppleKeychain keychain;
   keychain.set_find_generic_result(errSecNotAvailable);
-  EncryptorPassword password(keychain);
-  EXPECT_TRUE(password.GetEncryptorPassword().empty());
+  KeychainPassword password(keychain);
+  EXPECT_TRUE(password.GetPassword().empty());
   EXPECT_FALSE(keychain.called_add_generic());
   EXPECT_EQ(0, keychain.password_data_count());
 }
 
 // Test that subsequent additions to the keychain give different passwords.
-TEST(EncryptorPasswordTest, PasswordsDiffer) {
+TEST(KeychainPasswordTest, PasswordsDiffer) {
   MockAppleKeychain keychain1;
   keychain1.set_find_generic_result(errSecItemNotFound);
-  EncryptorPassword encryptor_password1(keychain1);
-  std::string password1 = encryptor_password1.GetEncryptorPassword();
+  KeychainPassword encryptor_password1(keychain1);
+  std::string password1 = encryptor_password1.GetPassword();
   EXPECT_FALSE(password1.empty());
   EXPECT_TRUE(keychain1.called_add_generic());
   EXPECT_EQ(0, keychain1.password_data_count());
 
   MockAppleKeychain keychain2;
   keychain2.set_find_generic_result(errSecItemNotFound);
-  EncryptorPassword encryptor_password2(keychain2);
-  std::string password2 = encryptor_password2.GetEncryptorPassword();
+  KeychainPassword encryptor_password2(keychain2);
+  std::string password2 = encryptor_password2.GetPassword();
   EXPECT_FALSE(password2.empty());
   EXPECT_TRUE(keychain2.called_add_generic());
   EXPECT_EQ(0, keychain2.password_data_count());