Add base:: to string16s in chrome/.

chrome/utility/importer/firefox_importer.cc

 // Copyright 2013 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.h"
 
 #include <set>
 
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
@@ skipping 63 matching lines @@
 
   return true;
 }
 
 }  // namespace
 
 struct FirefoxImporter::BookmarkItem {
   int parent;
   int id;
   GURL url;
-  string16 title;
+  base::string16 title;
   BookmarkItemType type;
   std::string keyword;
   base::Time date_added;
   int64 favicon;
   bool empty_folder;
 };
 
 FirefoxImporter::FirefoxImporter() {
 }
 
@@ skipping 156 matching lines @@
     } else {
       continue;
     }
 
     // Skip the default bookmarks and unwanted URLs.
     if (default_urls.find(item->url) != default_urls.end() ||
         post_keyword_ids.find(item->id) != post_keyword_ids.end())
       continue;
 
     // Find the bookmark path by tracing their links to parent folders.
-    std::vector<string16> path;
+    std::vector<base::string16> path;
     BookmarkItem* child = item;
     bool found_path = false;
     bool is_in_toolbar = false;
     while (child->parent >= 0) {
       BookmarkItem* parent = list[child->parent];
       if (livemark_id.find(parent->id) != livemark_id.end()) {
         // Don't import live bookmarks.
         break;
       }
 
@@ skipping 42 matching lines @@
         url_keyword_info.display_name = item->title;
         url_keywords.push_back(url_keyword_info);
       }
     }
   }
 
   STLDeleteElements(&list);
 
   // Write into profile.
   if (!bookmarks.empty() && !cancelled()) {
-    const string16& first_folder_name =
+    const base::string16& first_folder_name =
         bridge_->GetLocalizedString(IDS_BOOKMARK_GROUP_FROM_FIREFOX);
     bridge_->AddBookmarks(bookmarks, first_folder_name);
   }
   if (!url_keywords.empty() && !cancelled()) {
     bridge_->SetKeywords(url_keywords, false);
   }
   if (!favicon_map.empty() && !cancelled()) {
     std::vector<ImportedFaviconUsage> favicons;
     LoadFavicons(&db, favicon_map, &favicons);
     bridge_->SetFavicons(favicons);
@@ skipping 260 matching lines @@
 
       if (!importer::ReencodeFavicon(&data[0], data.size(), &usage.png_data))
         continue;  // Unable to decode.
 
       usage.urls = i->second;
       favicons->push_back(usage);
     }
     s.Reset(true);
   }
 }