Add base:: to string16s in chrome/.

chrome/utility/importer/firefox_importer_unittest_utils_mac.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/firefox_importer_unittest_utils.h"
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 69 matching lines @@
     sender_ = sender;
   }
 
   void OnInitDecryptorResponse(bool result) {
     DCHECK(!got_result);
     result_bool = result;
     got_result = true;
     base::MessageLoop::current()->Quit();
   }
 
-  void OnDecryptedTextResonse(const string16& decrypted_text) {
+  void OnDecryptedTextResonse(const base::string16& decrypted_text) {
     DCHECK(!got_result);
     result_string = decrypted_text;
     got_result = true;
     base::MessageLoop::current()->Quit();
   }
 
   void QuitClient() {
     if (sender_)
       sender_->Send(new Msg_Decryptor_Quit());
   }
 
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE {
     bool handled = true;
     IPC_BEGIN_MESSAGE_MAP(FFDecryptorServerChannelListener, msg)
       IPC_MESSAGE_HANDLER(Msg_Decryptor_InitReturnCode, OnInitDecryptorResponse)
       IPC_MESSAGE_HANDLER(Msg_Decryptor_Response, OnDecryptedTextResonse)
       IPC_MESSAGE_UNHANDLED(handled = false)
     IPC_END_MESSAGE_MAP()
     return handled;
   }
 
   // If an error occured, just kill the message Loop.
   virtual void OnChannelError() OVERRIDE {
     got_result = false;
     base::MessageLoop::current()->Quit();
   }
 
   // Results of IPC calls.
-  string16 result_string;
+  base::string16 result_string;
   bool result_bool;
   // True if IPC call succeeded and data in above variables is valid.
   bool got_result;
 
  private:
   IPC::Sender* sender_;  // weak
 };
 
 FFUnitTestDecryptorProxy::FFUnitTestDecryptorProxy()
     : child_process_(0) {
@@ skipping 69 matching lines @@
                                              const base::FilePath& db_path) {
   channel_->Send(new Msg_Decryptor_Init(dll_path, db_path));
   bool ok = WaitForClientResponse();
   if (ok && listener_->got_result) {
     listener_->got_result = false;
     return listener_->result_bool;
   }
   return false;
 }
 
-string16 FFUnitTestDecryptorProxy::Decrypt(const std::string& crypt) {
+base::string16 FFUnitTestDecryptorProxy::Decrypt(const std::string& crypt) {
   channel_->Send(new Msg_Decrypt(crypt));
   bool ok = WaitForClientResponse();
   if (ok && listener_->got_result) {
     listener_->got_result = false;
     return listener_->result_string;
   }
-  return string16();
+  return base::string16();
 }
 
 //---------------------------- Child Process -----------------------
 
 // Class to listen on the client side of the ipc channel, it calls through
 // to the NSSDecryptor and sends back a reply.
 class FFDecryptorClientChannelListener : public IPC::Listener {
  public:
   FFDecryptorClientChannelListener()
       : sender_(NULL) {}
 
   void SetSender(IPC::Sender* sender) {
     sender_ = sender;
   }
 
   void OnDecryptor_Init(base::FilePath dll_path, base::FilePath db_path) {
     bool ret = decryptor_.Init(dll_path, db_path);
     sender_->Send(new Msg_Decryptor_InitReturnCode(ret));
   }
 
   void OnDecrypt(std::string crypt) {
-    string16 unencrypted_str = decryptor_.Decrypt(crypt);
+    base::string16 unencrypted_str = decryptor_.Decrypt(crypt);
     sender_->Send(new Msg_Decryptor_Response(unencrypted_str));
   }
 
   void OnQuitRequest() {
     base::MessageLoop::current()->Quit();
   }
 
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE {
     bool handled = true;
     IPC_BEGIN_MESSAGE_MAP(FFDecryptorClientChannelListener, msg)
@@ skipping 21 matching lines @@
 
   IPC::Channel channel(kTestChannelID, IPC::Channel::MODE_CLIENT, &listener);
   CHECK(channel.Connect());
   listener.SetSender(&channel);
 
   // run message loop
   base::MessageLoop::current()->Run();
 
   return 0;
 }