Convert encryptor.cc and friends to string16.

chrome/browser/password_manager/encryptor.h

Index: chrome/browser/password_manager/encryptor.h
===================================================================
--- chrome/browser/password_manager/encryptor.h	(revision 10646)
+++ chrome/browser/password_manager/encryptor.h	(working copy)
@@ -3,27 +3,28 @@
 // found in the LICENSE file.
 // A class for encrypting/decrypting strings
 
-#ifndef CHROME_BROWSER_ENCRYPTOR_H__
-#define CHROME_BROWSER_ENCRYPTOR_H__
+#ifndef CHROME_BROWSER_PASSWORD_MANAGER_ENCRYPTOR_H__
+#define CHROME_BROWSER_PASSWORD_MANAGER_ENCRYPTOR_H__
 
 #include <string>
 
 #include "base/values.h"
+#include "base/string16.h"
 
 class Encryptor {
-public:
-  // Encrypt a wstring. The output (second argument) is
+ 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 EncryptWideString(const std::wstring& plaintext,
-                                std::string* ciphertext);
+  static bool EncryptString16(const string16& plaintext,
+                              std::string* ciphertext);
 
-  // Decrypt an array of bytes obtained with EnctryptWideString
-  // back into a wstring. Note that the input (first argument)
+  // 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)
   // data into a string.
-  static bool DecryptWideString(const std::string& ciphertext,
-                                std::wstring* plaintext);
+  static bool DecryptString16(const std::string& ciphertext,
+                              string16* plaintext);
 
   // Encrypt a string.
   static bool EncryptString(const std::string& plaintext,
@@ -36,9 +37,8 @@
   static bool DecryptString(const std::string& ciphertext,
                             std::string* plaintext);
 
-private:
+ private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(Encryptor);
 };
 
-#endif  // CHROME_BROWSER_ENCRYPTOR_H__
-
+#endif  // CHROME_BROWSER_PASSWORD_MANAGER_ENCRYPTOR_H__