Add base:: to string16s in chrome/.

chrome/utility/importer/nss_decryptor.cc

 // 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 "chrome/utility/importer/nss_decryptor.h"
 
 #include <string>
 #include <vector>
 
 #include "base/base64.h"
@@ skipping 43 matching lines @@
 * of those above. If you wish to allow use of your version of this file only
 * under the terms of either the GPL or the LGPL, and not to allow others to
 * use your version of this file under the terms of the MPL, indicate your
 * decision by deleting the provisions above and replace them with the notice
 * and other provisions required by the GPL or the LGPL. If you do not delete
 * the provisions above, a recipient may use your version of this file under
 * the terms of any one of the MPL, the GPL or the LGPL.
 *
 * ***** END LICENSE BLOCK ***** */
 
-string16 NSSDecryptor::Decrypt(const std::string& crypt) const {
+base::string16 NSSDecryptor::Decrypt(const std::string& crypt) const {
   // Do nothing if NSS is not loaded.
   if (!is_nss_initialized_)
-    return string16();
+    return base::string16();
 
   // The old style password is encoded in base64. They are identified
   // by a leading '~'. Otherwise, we should decrypt the text.
   std::string plain;
   if (crypt[0] != '~') {
     std::string decoded_data;
     base::Base64Decode(crypt, &decoded_data);
     PK11SlotInfo* slot = GetKeySlotForDB();
     SECStatus result = PK11_Authenticate(slot, PR_TRUE, NULL);
     if (result != SECSuccess) {
       FreeSlot(slot);
-      return string16();
+      return base::string16();
     }
 
     SECItem request;
     request.data = reinterpret_cast<unsigned char*>(
         const_cast<char*>(decoded_data.data()));
     request.len = static_cast<unsigned int>(decoded_data.size());
     SECItem reply;
     reply.data = NULL;
     reply.len = 0;
 #if defined(USE_NSS)
@@ skipping 200 matching lines @@
     // The user name, password and action.
     form.username_element = s2.ColumnString16(3);
     form.username_value = Decrypt(s2.ColumnString(5));
     form.password_element = s2.ColumnString16(4);
     form.password_value = Decrypt(s2.ColumnString(6));
     form.action = GURL(s2.ColumnString(2)).ReplaceComponents(rep);
     forms->push_back(form);
   }
   return true;
 }