Convert string16 -> base::string16 in components/

components/webdata/encryptor/encryptor_mac.mm

 // Copyright (c) 2012 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/webdata/encryptor/encryptor.h"
 
 #include <CommonCrypto/CommonCryptor.h>  // for kCCBlockSizeAES128
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 51 matching lines @@
                                                   salt,
                                                   kEncryptionIterations,
                                                   kDerivedKeySizeInBits));
   DCHECK(encryption_key.get());
 
   return encryption_key.release();
 }
 
 }  // namespace
 
-bool Encryptor::EncryptString16(const string16& plaintext,
+bool Encryptor::EncryptString16(const base::string16& plaintext,
                                 std::string* ciphertext) {
   return EncryptString(UTF16ToUTF8(plaintext), ciphertext);
 }
 
 bool Encryptor::DecryptString16(const std::string& ciphertext,
-                                string16* plaintext) {
+                                base::string16* plaintext) {
   std::string utf8;
   if (!DecryptString(ciphertext, &utf8))
     return false;
 
   *plaintext = UTF8ToUTF16(utf8);
   return true;
 }
 
 bool Encryptor::EncryptString(const std::string& plaintext,
                               std::string* ciphertext) {
@@ skipping 52 matching lines @@
   if (!encryptor.Decrypt(raw_ciphertext, plaintext))
     return false;
 
   return true;
 }
 
 void Encryptor::UseMockKeychain(bool use_mock) {
   use_mock_keychain = use_mock;
 }