Move encryptor API out of webdata.

components/encryptor/encryptor.h

 // Copyright (c) 2010 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_WEBDATA_ENCRYPTOR_ENCRYPTOR_H_
-#define COMPONENTS_WEBDATA_ENCRYPTOR_ENCRYPTOR_H_
+#ifndef COMPONENTS_ENCRYPTOR_ENCRYPTOR_H_
+#define COMPONENTS_ENCRYPTOR_ENCRYPTOR_H_
 
 #include <string>
 
 #include "base/strings/string16.h"
 
 // The Encryptor class gives access to simple encryption and decryption of
 // strings.  Note that on Mac, access to the system Keychain is required and
 // these calls can block the current thread to collect user input.
 class Encryptor {

[bcwhite, 2014/02/18 15:02:53]

It was suggested to change the name of the class to something like "OSCrypt" so
as to avoid confusion with the other Encryptor class in crypto/

  public:
   // Encrypt a string16. The output (second argument) is
   // really an array of bytes, but we're passing it back
   // as a std::string
   static bool EncryptString16(const base::string16& plaintext,
                               std::string* ciphertext);
 
   // Decrypt an array of bytes obtained with EncryptString16
   // back into a string16. Note that the input (first argument)
   // is a std::string, so you need to first get your (binary)
@@ skipping 15 matching lines @@
 #if defined(OS_MACOSX)
   // For unit testing purposes we instruct the Encryptor to use a mock Keychain
   // on the Mac.  The default is to use the real Keychain.
   static void UseMockKeychain(bool use_mock);
 #endif
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(Encryptor);
 };
 
-#endif  // COMPONENTS_WEBDATA_ENCRYPTOR_ENCRYPTOR_H_
+#endif  // COMPONENTS_ENCRYPTOR_ENCRYPTOR_H_