importer: Convert GetLocalizedString to string16.

(Note: this was a TODO for viettrungluu).

BUG=23581
TEST=None

R=avi@chromium.org

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

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

9 files changed, 19 insertions, 23 deletions

diff --git a/chrome/browser/importer/external_process_importer_bridge.cc b/chrome/browser/importer/external_process_importer_bridge.cc
index b88a416..c262483 100644
--- a/chrome/browser/importer/external_process_importer_bridge.cc
+++ b/chrome/browser/importer/external_process_importer_bridge.cc
@@ -85,11 +85,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) {
+string16 ExternalProcessImporterBridge::GetLocalizedString(int message_id) {
   string16 message;
   localized_strings_->GetString(base::IntToString(message_id), &message);
-  return UTF16ToWideHack(message);
+  return message;
 }
 
 ExternalProcessImporterBridge::~ExternalProcessImporterBridge() {}
diff --git a/chrome/browser/importer/external_process_importer_bridge.h b/chrome/browser/importer/external_process_importer_bridge.h
index 61a48de..dccf163 100644
--- a/chrome/browser/importer/external_process_importer_bridge.h
+++ b/chrome/browser/importer/external_process_importer_bridge.h
@@ -55,7 +55,7 @@ class ExternalProcessImporterBridge : public ImporterBridge {
   virtual void NotifyItemEnded(importer::ImportItem item) OVERRIDE;
   virtual void NotifyEnded() OVERRIDE;
 
-  virtual std::wstring GetLocalizedString(int message_id) OVERRIDE;
+  virtual string16 GetLocalizedString(int message_id) OVERRIDE;
   // End ImporterBridge implementation.
 
  private:
diff --git a/chrome/browser/importer/firefox2_importer.cc b/chrome/browser/importer/firefox2_importer.cc
index fb1261d..e6aae3c 100644
--- a/chrome/browser/importer/firefox2_importer.cc
+++ b/chrome/browser/importer/firefox2_importer.cc
@@ -291,9 +291,9 @@ void Firefox2Importer::ImportBookmarks() {
   if (!parsing_bookmarks_html_file_)
     file = file.AppendASCII("bookmarks.html");
   std::wstring first_folder_name;
-  first_folder_name = bridge_->GetLocalizedString(
+  first_folder_name = UTF16ToWideHack(bridge_->GetLocalizedString(
       parsing_bookmarks_html_file_ ? IDS_BOOKMARK_GROUP :
-                                     IDS_BOOKMARK_GROUP_FROM_FIREFOX);
+                                     IDS_BOOKMARK_GROUP_FROM_FIREFOX));
 
   ImportBookmarksFile(file, default_urls, import_to_bookmark_bar(),
                       first_folder_name, this, &bookmarks, &template_urls,
diff --git a/chrome/browser/importer/firefox3_importer.cc b/chrome/browser/importer/firefox3_importer.cc
index b3498ba..6ed4ea6 100644
--- a/chrome/browser/importer/firefox3_importer.cc
+++ b/chrome/browser/importer/firefox3_importer.cc
@@ -198,8 +198,8 @@ void Firefox3Importer::ImportBookmarks() {
     return;
   }
 
-  std::wstring firefox_folder =
-      bridge_->GetLocalizedString(IDS_BOOKMARK_GROUP_FROM_FIREFOX);
+  std::wstring firefox_folder = UTF16ToWideHack(
+      bridge_->GetLocalizedString(IDS_BOOKMARK_GROUP_FROM_FIREFOX));
   for (size_t i = 0; i < list.size(); ++i) {
     BookmarkItem* item = list[i];
 
@@ -285,8 +285,8 @@ void Firefox3Importer::ImportBookmarks() {
 
   // Write into profile.
   if (!bookmarks.empty() && !cancelled()) {
-    const std::wstring& first_folder_name =
-        bridge_->GetLocalizedString(IDS_BOOKMARK_GROUP_FROM_FIREFOX);
+    const std::wstring& first_folder_name = UTF16ToWide(
+        bridge_->GetLocalizedString(IDS_BOOKMARK_GROUP_FROM_FIREFOX));
     int options = 0;
     if (import_to_bookmark_bar())
       options = ProfileWriter::IMPORT_TO_BOOKMARK_BAR;
diff --git a/chrome/browser/importer/importer_bridge.h b/chrome/browser/importer/importer_bridge.h
index 5a16bfd..5731c58 100644
--- a/chrome/browser/importer/importer_bridge.h
+++ b/chrome/browser/importer/importer_bridge.h
@@ -11,6 +11,7 @@
 
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
+#include "base/string16.h"
 #include "build/build_config.h"
 #include "chrome/browser/importer/importer_data_types.h"
 // TODO: remove this, see friend declaration in ImporterBridge.
@@ -57,7 +58,7 @@ class ImporterBridge : public base::RefCountedThreadSafe<ImporterBridge> {
   // this calls the set of strings we've ported over to the external process.
   // It's good to avoid having to create a separate ResourceBundle for the
   // external import process, since the importer only needs a few strings.
-  virtual std::wstring GetLocalizedString(int message_id) = 0;
+  virtual string16 GetLocalizedString(int message_id) = 0;
 
  protected:
   friend class base::RefCountedThreadSafe<ImporterBridge>;
diff --git a/chrome/browser/importer/in_process_importer_bridge.cc b/chrome/browser/importer/in_process_importer_bridge.cc
index b65592d..382871f 100644
--- a/chrome/browser/importer/in_process_importer_bridge.cc
+++ b/chrome/browser/importer/in_process_importer_bridge.cc
@@ -106,8 +106,8 @@ void InProcessImporterBridge::NotifyEnded() {
       NewRunnableMethod(host_, &ImporterHost::NotifyImportEnded));
 }
 
-std::wstring InProcessImporterBridge::GetLocalizedString(int message_id) {
-  return UTF16ToWideHack(l10n_util::GetStringUTF16(message_id));
+string16 InProcessImporterBridge::GetLocalizedString(int message_id) {
+  return l10n_util::GetStringUTF16(message_id);
 }
 
 InProcessImporterBridge::~InProcessImporterBridge() {}
diff --git a/chrome/browser/importer/in_process_importer_bridge.h b/chrome/browser/importer/in_process_importer_bridge.h
index 7d4d3d5..bde4320 100644
--- a/chrome/browser/importer/in_process_importer_bridge.h
+++ b/chrome/browser/importer/in_process_importer_bridge.h
@@ -47,7 +47,7 @@ class InProcessImporterBridge : public ImporterBridge {
   virtual void NotifyItemEnded(importer::ImportItem item) OVERRIDE;
   virtual void NotifyEnded() OVERRIDE;
 
-  virtual std::wstring GetLocalizedString(int message_id) OVERRIDE;
+  virtual string16 GetLocalizedString(int message_id) OVERRIDE;
   // End ImporterBridge implementation.
 
  private:
diff --git a/chrome/browser/importer/safari_importer.mm b/chrome/browser/importer/safari_importer.mm
index 39d58a79..ba93d64 100644
--- a/chrome/browser/importer/safari_importer.mm
+++ b/chrome/browser/importer/safari_importer.mm
@@ -103,8 +103,8 @@ void SafariImporter::ImportBookmarks() {
 
   // Write bookmarks into profile.
   if (!bookmarks.empty() && !cancelled()) {
-    const std::wstring& first_folder_name =
-        bridge_->GetLocalizedString(IDS_BOOKMARK_GROUP_FROM_SAFARI);
+    const std::wstring& first_folder_name = UTF16ToWideHack(
+        bridge_->GetLocalizedString(IDS_BOOKMARK_GROUP_FROM_SAFARI));
     int options = 0;
     if (import_to_bookmark_bar())
       options = ProfileWriter::IMPORT_TO_BOOKMARK_BAR;
diff --git a/chrome/browser/importer/toolbar_importer.cc b/chrome/browser/importer/toolbar_importer.cc
index 3baad56..573531b 100644
--- a/chrome/browser/importer/toolbar_importer.cc
+++ b/chrome/browser/importer/toolbar_importer.cc
@@ -23,9 +23,7 @@
 #include "net/base/data_url.h"
 #include "net/url_request/url_request_context.h"
 
-//
 // ToolbarImporterUtils
-//
 static const char* kGoogleDomainUrl = "http://.google.com/";
 static const wchar_t kSplitStringToken = L';';
 static const char* kGoogleDomainSecureCookieId = "SID=";
@@ -292,8 +290,7 @@ void Toolbar5Importer::GetBookmarksFromServerDataResponse(
     // Construct Bookmarks
     std::vector<ProfileWriter::BookmarkEntry> bookmarks;
     if (ParseBookmarksFromReader(&reader, &bookmarks,
-        WideToUTF16(bridge_->GetLocalizedString(
-            IDS_BOOKMARK_GROUP_FROM_GOOGLE_TOOLBAR))))
+        bridge_->GetLocalizedString(IDS_BOOKMARK_GROUP_FROM_GOOGLE_TOOLBAR)))
       AddBookmarksToChrome(bookmarks);
   }
   EndImportBookmarks();
@@ -584,12 +581,11 @@ bool Toolbar5Importer::ExtractFoldersFromXmlReader(
   return true;
 }
 
-// Bookmark creation
 void  Toolbar5Importer::AddBookmarksToChrome(
     const std::vector<ProfileWriter::BookmarkEntry>& bookmarks) {
   if (!bookmarks.empty() && !cancelled()) {
-    const std::wstring& first_folder_name =
-        bridge_->GetLocalizedString(IDS_BOOKMARK_GROUP_FROM_GOOGLE_TOOLBAR);
+    const std::wstring& first_folder_name = UTF16ToWideHack(
+        bridge_->GetLocalizedString(IDS_BOOKMARK_GROUP_FROM_GOOGLE_TOOLBAR));
     int options = ProfileWriter::ADD_IF_UNIQUE |
         (import_to_bookmark_bar() ? ProfileWriter::IMPORT_TO_BOOKMARK_BAR : 0);
     bridge_->AddBookmarkEntries(bookmarks, first_folder_name, options);