1 files changed, 14 insertions, 8 deletions
diff --git a/chrome/browser/importer/importer_bridge.cc b/chrome/browser/importer/importer_bridge.cc
index 72a73a6..079ebe3 100644
--- a/chrome/browser/importer/importer_bridge.cc
+++ b/chrome/browser/importer/importer_bridge.cc
@@ -6,6 +6,9 @@
 
 #include "app/l10n_util.h"
 #include "base/scoped_ptr.h"
+#include "base/string_number_conversions.h"
+#include "base/string16.h"
+#include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/history/history_types.h"
@@ -58,10 +61,12 @@ void InProcessImporterBridge::SetFavIcons(
 }
 
 void InProcessImporterBridge::SetHistoryItems(
-    const std::vector<history::URLRow> &rows) {
+    const std::vector<history::URLRow> &rows,
+    history::VisitSource visit_source) {
   ChromeThread::PostTask(
       ChromeThread::UI, FROM_HERE,
-      NewRunnableMethod(writer_, &ProfileWriter::AddHistoryPage, rows));
+      NewRunnableMethod(writer_, &ProfileWriter::AddHistoryPage,
+                        rows, visit_source));
 }
 
 void InProcessImporterBridge::SetKeywords(
@@ -147,8 +152,9 @@ void ExternalProcessImporterBridge::SetFavIcons(
 }
 
 void ExternalProcessImporterBridge::SetHistoryItems(
-    const std::vector<history::URLRow> &rows) {
-  profile_import_thread_->NotifyHistoryImportReady(rows);
+    const std::vector<history::URLRow> &rows,
+    history::VisitSource visit_source) {
+  profile_import_thread_->NotifyHistoryImportReady(rows, visit_source);
 }
 
 void ExternalProcessImporterBridge::SetKeywords(
@@ -181,10 +187,10 @@ void ExternalProcessImporterBridge::NotifyEnded() {
   // The internal process detects import end when all items have been received.
 }
 
+// TODO(viettrungluu): convert to string16.
 std::wstring ExternalProcessImporterBridge::GetLocalizedString(
     int message_id) {
-  std::wstring message;
-  localized_strings_->GetString(IntToWString(message_id), &message);
-  return message;
+  string16 message;
+  localized_strings_->GetString(base::IntToString(message_id), &message);
+  return UTF16ToWideHack(message);
 }
-