Rename components's Encryptor to OSEncrypt.

components/encryptor/encryptor_password_mac.h

 // 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.
 
 #ifndef COMPONENTS_ENCRYPTOR_ENCRYPTOR_PASSWORD_MAC_H_
 #define COMPONENTS_ENCRYPTOR_ENCRYPTOR_PASSWORD_MAC_H_
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 
 namespace crypto {
 class AppleKeychain;
-}  // namespace crypto
+}
 
 class EncryptorPassword {

[Jói, 2014/02/28 13:43:39]

Shouldn't this (and similar classes) also be renamed, and eventually (separate
change) the directory name be changed from components/encryptor to
components/oscrypt?

[tfarina, 2014/02/28 14:26:56]

Renamed to KeychainPassword. I will change the directory name in a follow up.

  public:
   explicit EncryptorPassword(const crypto::AppleKeychain& keychain)
       : keychain_(keychain) {
   }
 
   // Get the Encryptor password for this system.  If no password exists
   // in the Keychain then one is generated, stored in the Mac keychain, and
   // returned.
   // If one exists then it is fetched from the Keychain and returned.
   // If the user disallows access to the Keychain (or an error occurs) then an
   // empty string is returned.
   std::string GetEncryptorPassword() const;
 
  private:
+  const crypto::AppleKeychain& keychain_;
+
   DISALLOW_COPY_AND_ASSIGN(EncryptorPassword);
-  const crypto::AppleKeychain& keychain_;
 };
 
 #endif  // COMPONENTS_ENCRYPTOR_ENCRYPTOR_PASSWORD_MAC_H_