Index: chrome/utility/importer/safari_importer.h |
diff --git a/chrome/utility/importer/safari_importer.h b/chrome/utility/importer/safari_importer.h |
index ea64284105a873f7e5707cbf79772f85771430f6..756dac9c78f038da184ec9b15333e99c1100fa30 100644 |
--- a/chrome/utility/importer/safari_importer.h |
+++ b/chrome/utility/importer/safari_importer.h |
@@ -61,7 +61,7 @@ class SafariImporter : public Importer { |
void ImportHistory(); |
// Parse Safari's stored bookmarks. |
- void ParseBookmarks(const string16& toolbar_name, |
+ void ParseBookmarks(const base::string16& toolbar_name, |
std::vector<ImportedBookmarkEntry>* bookmarks); |
// Function to recursively read Bookmarks out of Safari plist. |
@@ -71,9 +71,9 @@ class SafariImporter : public Importer { |
// |out_bookmarks| BookMark element array to write into. |
void 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); |
// Converts history time stored by Safari as a double serialized as a string, |