summaryrefslogtreecommitdiffstats
path: root/components/webdata/encryptor/encryptor.h
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-11 17:54:31 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-11 17:54:31 +0000
commitd5ca8fb9e9c8de2991fd760dea1dab777d1850ca (patch)
tree36fa7564bcc8defe812e73e0ce736909aacbee1c /components/webdata/encryptor/encryptor.h
parent63a7a46b6a5c29a3fa639491cce16df08a5b0c63 (diff)
downloadchromium_src-d5ca8fb9e9c8de2991fd760dea1dab777d1850ca.zip
chromium_src-d5ca8fb9e9c8de2991fd760dea1dab777d1850ca.tar.gz
chromium_src-d5ca8fb9e9c8de2991fd760dea1dab777d1850ca.tar.bz2
Convert string16 -> base::string16 in components/
BUG= Review URL: https://codereview.chromium.org/13973004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193682 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/webdata/encryptor/encryptor.h')
-rw-r--r--components/webdata/encryptor/encryptor.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/components/webdata/encryptor/encryptor.h b/components/webdata/encryptor/encryptor.h
index 94ce108..d76c3c7 100644
--- a/components/webdata/encryptor/encryptor.h
+++ b/components/webdata/encryptor/encryptor.h
@@ -17,7 +17,7 @@ class Encryptor {
// 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 string16& plaintext,
+ static bool EncryptString16(const base::string16& plaintext,
std::string* ciphertext);
// Decrypt an array of bytes obtained with EncryptString16
@@ -25,7 +25,7 @@ class Encryptor {
// is a std::string, so you need to first get your (binary)
// data into a string.
static bool DecryptString16(const std::string& ciphertext,
- string16* plaintext);
+ base::string16* plaintext);
// Encrypt a string.
static bool EncryptString(const std::string& plaintext,