Add base:: to string16s in chrome/.

chrome/utility/importer/external_process_importer_bridge.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/external_process_importer_bridge.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 23 matching lines @@
     base::TaskRunner* task_runner)
     : sender_(sender),
       task_runner_(task_runner) {
   // Bridge needs to make its own copy because OS 10.6 autoreleases the
   // localized_strings value that is passed in (see http://crbug.com/46003 ).
   localized_strings_.reset(localized_strings.DeepCopy());
 }
 
 void ExternalProcessImporterBridge::AddBookmarks(
     const std::vector<ImportedBookmarkEntry>& bookmarks,
-    const string16& first_folder_name) {
+    const base::string16& first_folder_name) {
   Send(new ProfileImportProcessHostMsg_NotifyBookmarksImportStart(
       first_folder_name, bookmarks.size()));
 
   // |bookmarks_left| is required for the checks below as Windows has a
   // Debug bounds-check which prevents pushing an iterator beyond its end()
   // (i.e., |it + 2 < s.end()| crashes in debug mode if |i + 1 == s.end()|).
   int bookmarks_left = bookmarks.end() - bookmarks.begin();
   for (std::vector<ImportedBookmarkEntry>::const_iterator it =
            bookmarks.begin(); it < bookmarks.end();) {
     std::vector<ImportedBookmarkEntry> bookmark_group;
@@ skipping 96 matching lines @@
 }
 
 void ExternalProcessImporterBridge::NotifyItemEnded(importer::ImportItem item) {
   Send(new ProfileImportProcessHostMsg_ImportItem_Finished(item));
 }
 
 void ExternalProcessImporterBridge::NotifyEnded() {
   // The internal process detects import end when all items have been received.
 }
 
-string16 ExternalProcessImporterBridge::GetLocalizedString(int message_id) {
-  string16 message;
+base::string16 ExternalProcessImporterBridge::GetLocalizedString(
+    int message_id) {
+  base::string16 message;
   localized_strings_->GetString(base::IntToString(message_id), &message);
   return message;
 }
 
 ExternalProcessImporterBridge::~ExternalProcessImporterBridge() {}
 
 void ExternalProcessImporterBridge::Send(IPC::Message* message) {
   task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&ExternalProcessImporterBridge::SendInternal,
                  this, message));
 }
 
 void ExternalProcessImporterBridge::SendInternal(IPC::Message* message) {
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
   sender_->Send(message);
 }