importer: Convert AddBookmarkEntries to string16.

BUG=23581
TEST=None

R=avi@chromium.org

Review URL: http://codereview.chromium.org/6760037

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80266 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 13 insertions, 10 deletions

diff --git a/chrome/profile_import/profile_import_thread.cc b/chrome/profile_import/profile_import_thread.cc
index 3c1d3f2..872a4cd 100644
--- a/chrome/profile_import/profile_import_thread.cc
+++ b/chrome/profile_import/profile_import_thread.cc
@@ -99,6 +99,10 @@ void ProfileImportThread::OnImportItemFinished(uint16 item) {
     NotifyEnded();
 }
 
+void ProfileImportThread::NotifyStarted() {
+  Send(new ProfileImportProcessHostMsg_Import_Started());
+}
+
 void ProfileImportThread::NotifyItemStarted(importer::ImportItem item) {
   Send(new ProfileImportProcessHostMsg_ImportItem_Started(item));
 }
@@ -107,10 +111,6 @@ void ProfileImportThread::NotifyItemEnded(importer::ImportItem item) {
   Send(new ProfileImportProcessHostMsg_ImportItem_Finished(item));
 }
 
-void ProfileImportThread::NotifyStarted() {
-  Send(new ProfileImportProcessHostMsg_Import_Started());
-}
-
 void ProfileImportThread::NotifyEnded() {
   Send(new ProfileImportProcessHostMsg_Import_Finished(true, ""));
   Cleanup();
@@ -142,7 +142,8 @@ void ProfileImportThread::NotifyHomePageImportReady(
 
 void ProfileImportThread::NotifyBookmarksImportReady(
     const std::vector<ProfileWriter::BookmarkEntry>& bookmarks,
-    const std::wstring& first_folder_name, int options) {
+    const string16& first_folder_name,
+    int options) {
   Send(new ProfileImportProcessHostMsg_NotifyBookmarksImportStart(
       first_folder_name, options, bookmarks.size()));
 
diff --git a/chrome/profile_import/profile_import_thread.h b/chrome/profile_import/profile_import_thread.h
index 80284eb..726c6f1 100644
--- a/chrome/profile_import/profile_import_thread.h
+++ b/chrome/profile_import/profile_import_thread.h
@@ -6,12 +6,12 @@
 #define CHROME_PROFILE_IMPORT_PROFILE_IMPORT_THREAD_H_
 #pragma once
 
-#include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/string16.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/importer/importer_data_types.h"
 #include "chrome/browser/importer/profile_writer.h"
@@ -45,23 +45,25 @@ class ProfileImportThread : public ChildThread {
   }
 
   // Bridging methods, called from importer_bridge tasks posted here.
+  void NotifyStarted();
   void NotifyItemStarted(importer::ImportItem item);
   void NotifyItemEnded(importer::ImportItem item);
-  void NotifyStarted();
   void NotifyEnded();
 
   // Bridging methods that move data back across the process boundary.
-  void NotifyHistoryImportReady(const std::vector<history::URLRow> &rows,
+  void NotifyHistoryImportReady(const std::vector<history::URLRow>& rows,
                                 history::VisitSource visit_source);
   void NotifyHomePageImportReady(const GURL& home_page);
   void NotifyBookmarksImportReady(
       const std::vector<ProfileWriter::BookmarkEntry>& bookmarks,
-          const std::wstring& first_folder_name, int options);
+      const string16& first_folder_name,
+      int options);
   void NotifyFaviconsImportReady(
       const std::vector<history::ImportedFaviconUsage>& favicons);
   void NotifyPasswordFormReady(const webkit_glue::PasswordForm& form);
   void NotifyKeywordsReady(const std::vector<TemplateURL*>& template_urls,
-      int default_keyword_index, bool unique_on_host_and_path);
+                           int default_keyword_index,
+                           bool unique_on_host_and_path);
 
  private:
   // IPC messages