components: Rename encryptor directory to os_crypt.

components/os_crypt/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/os_crypt.h"
+#include "components/os_crypt/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_switches.h"
-#include "components/encryptor/keychain_password_mac.h"
+#include "components/os_crypt/keychain_password_mac.h"
+#include "components/os_crypt/os_crypt_switches.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 12 matching lines @@
 // this and migrate to different encryption without data loss.
 const char kEncryptionVersionPrefix[] = "v10";
 
 // 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() {
   static bool mock_keychain_command_line_flag =
       CommandLine::ForCurrentProcess()->HasSwitch(
-          encryptor::switches::kUseMockKeychain);
+          os_crypt::switches::kUseMockKeychain);
 
   std::string password;
   if (use_mock_keychain || mock_keychain_command_line_flag) {
     password = "mock_password";
   } else {
     AppleKeychain keychain;
     KeychainPassword encryptor_password(keychain);
     password = encryptor_password.GetPassword();
   }
 
@@ skipping 88 matching lines @@
   if (!encryptor.Decrypt(raw_ciphertext, plaintext))
     return false;
 
   return true;
 }
 
 void OSCrypt::UseMockKeychain(bool use_mock) {
   use_mock_keychain = use_mock;
 }