Add base:: to string16s in chrome/.

chrome/utility/importer/safari_importer.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 <Cocoa/Cocoa.h>
 
 #include "chrome/utility/importer/safari_importer.h"
 
 #include <map>
 #include <vector>
@@ skipping 59 matching lines @@
   }
   if ((items & importer::PASSWORDS) && !cancelled()) {
     bridge_->NotifyItemStarted(importer::PASSWORDS);
     ImportPasswords();
     bridge_->NotifyItemEnded(importer::PASSWORDS);
   }
   bridge_->NotifyEnded();
 }
 
 void SafariImporter::ImportBookmarks() {
-  string16 toolbar_name =
+  base::string16 toolbar_name =
       bridge_->GetLocalizedString(IDS_BOOKMARK_BAR_FOLDER_NAME);
   std::vector<ImportedBookmarkEntry> bookmarks;
   ParseBookmarks(toolbar_name, &bookmarks);
 
   // Write bookmarks into profile.
   if (!bookmarks.empty() && !cancelled()) {
-    const string16& first_folder_name =
+    const base::string16& first_folder_name =
         bridge_->GetLocalizedString(IDS_BOOKMARK_GROUP_FROM_SAFARI);
     bridge_->AddBookmarks(bookmarks, first_folder_name);
   }
 
   // Import favicons.
   sql::Connection db;
   if (!OpenDatabase(&db))
     return;
 
   FaviconMap favicon_map;
@@ skipping 61 matching lines @@
         continue;  // Unable to decode.
 
       usage.urls = i->second;
       favicons->push_back(usage);
     }
   }
 }
 
 void SafariImporter::RecursiveReadBookmarksFolder(
     NSDictionary* bookmark_folder,
-    const std::vector<string16>& parent_path_elements,
+    const std::vector<base::string16>& parent_path_elements,
     bool is_in_toolbar,
-    const string16& toolbar_name,
+    const base::string16& toolbar_name,
     std::vector<ImportedBookmarkEntry>* out_bookmarks) {
   DCHECK(bookmark_folder);
 
   NSString* type = [bookmark_folder objectForKey:@"WebBookmarkType"];
   NSString* title = [bookmark_folder objectForKey:@"Title"];
 
   // Are we the dictionary that contains all other bookmarks?
   // We need to know this so we don't add it to the path.
   bool is_top_level_bookmarks_container = [bookmark_folder
       objectForKey:@"WebBookmarkFileVersion"] != nil;
@@ skipping 21 matching lines @@
     entry.creation_time = base::Time::Now();
     entry.title = base::SysNSStringToUTF16(title);
     entry.path = parent_path_elements;
     entry.in_toolbar = is_in_toolbar;
     entry.is_folder = true;
 
     out_bookmarks->push_back(entry);
     return;
   }
 
-  std::vector<string16> path_elements(parent_path_elements);
+  std::vector<base::string16> path_elements(parent_path_elements);
   // Create a folder for the toolbar, but not for the bookmarks menu.
   if (path_elements.empty() && [title isEqualToString:@"BookmarksBar"]) {
     is_in_toolbar = true;
     path_elements.push_back(toolbar_name);
   } else if (!is_top_level_bookmarks_container &&
              !(path_elements.empty() &&
                [title isEqualToString:@"BookmarksMenu"])) {
     if (title)
       path_elements.push_back(base::SysNSStringToUTF16(title));
   }
@@ skipping 32 matching lines @@
     entry.title = base::SysNSStringToUTF16(title);
     entry.url = GURL(base::SysNSStringToUTF8(url));
     entry.path = path_elements;
     entry.in_toolbar = is_in_toolbar;
 
     out_bookmarks->push_back(entry);
   }
 }
 
 void SafariImporter::ParseBookmarks(
-    const string16& toolbar_name,
+    const base::string16& toolbar_name,
     std::vector<ImportedBookmarkEntry>* bookmarks) {
   DCHECK(bookmarks);
 
   // Construct ~/Library/Safari/Bookmarks.plist path
   NSString* library_dir = [NSString
       stringWithUTF8String:library_dir_.value().c_str()];
   NSString* safari_dir = [library_dir
       stringByAppendingPathComponent:@"Safari"];
   NSString* bookmarks_plist = [safari_dir
     stringByAppendingPathComponent:@"Bookmarks.plist"];
 
   // Load the plist file.
   NSDictionary* bookmarks_dict = [NSDictionary
       dictionaryWithContentsOfFile:bookmarks_plist];
   if (!bookmarks_dict)
     return;
 
   // Recursively read in bookmarks.
-  std::vector<string16> parent_path_elements;
+  std::vector<base::string16> parent_path_elements;
   RecursiveReadBookmarksFolder(bookmarks_dict, parent_path_elements, false,
                                toolbar_name, bookmarks);
 }
 
 void SafariImporter::ImportPasswords() {
   // Safari stores it's passwords in the Keychain, same as us so we don't need
   // to import them.
   // Note: that we don't automatically pick them up, there is some logic around
   // the user needing to explicitly input his username in a page and blurring
   // the field before we pick it up, but the details of that are beyond the
@@ skipping 73 matching lines @@
     if (!last_visit_str)
       continue;
 
     // Convert Safari's last visit time to Unix Epoch time.
     double seconds_since_unix_epoch = HistoryTimeToEpochTime(last_visit_str);
     row.last_visit = base::Time::FromDoubleT(seconds_since_unix_epoch);
 
     history_items->push_back(row);
   }
 }