Remove wstring from l10n_util. Part 7....

chrome/browser/ui/views/user_data_dir_dialog.cc

Index: chrome/browser/ui/views/user_data_dir_dialog.cc
===================================================================
--- chrome/browser/ui/views/user_data_dir_dialog.cc	(revision 70562)
+++ chrome/browser/ui/views/user_data_dir_dialog.cc	(working copy)
@@ -5,6 +5,7 @@
 #include "app/l10n_util.h"
 #include "app/message_box_flags.h"
 #include "base/logging.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/views/user_data_dir_dialog.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ -25,8 +26,9 @@
     : ALLOW_THIS_IN_INITIALIZER_LIST(
           select_file_dialog_(SelectFileDialog::Create(this))),
       is_blocking_(true) {
-  std::wstring message_text = l10n_util::GetStringF(
-      IDS_CANT_WRITE_USER_DIRECTORY_SUMMARY, user_data_dir.ToWStringHack());
+  std::wstring message_text = UTF16ToWide(l10n_util::GetStringFUTF16(
+      IDS_CANT_WRITE_USER_DIRECTORY_SUMMARY,
+      WideToUTF16Hack(user_data_dir.ToWStringHack())));
   const int kDialogWidth = 400;
   message_box_view_ = new MessageBoxView(MessageBoxFlags::kIsConfirmMessageBox,
       message_text.c_str(), std::wstring(), kDialogWidth);
@@ -43,10 +45,11 @@
 
   switch (button) {
     case MessageBoxFlags::DIALOGBUTTON_OK:
-      return l10n_util::GetString(
-          IDS_CANT_WRITE_USER_DIRECTORY_CHOOSE_DIRECTORY_BUTTON);
+      return UTF16ToWide(l10n_util::GetStringUTF16(
+          IDS_CANT_WRITE_USER_DIRECTORY_CHOOSE_DIRECTORY_BUTTON));
     case MessageBoxFlags::DIALOGBUTTON_CANCEL:
-      return l10n_util::GetString(IDS_CANT_WRITE_USER_DIRECTORY_EXIT_BUTTON);
+      return UTF16ToWide(l10n_util::GetStringUTF16(
+          IDS_CANT_WRITE_USER_DIRECTORY_EXIT_BUTTON));
     default:
       NOTREACHED();
   }
@@ -55,7 +58,8 @@
 }
 
 std::wstring UserDataDirDialog::GetWindowTitle() const {
-  return l10n_util::GetString(IDS_CANT_WRITE_USER_DIRECTORY_TITLE);
+  return UTF16ToWide(
+      l10n_util::GetStringUTF16(IDS_CANT_WRITE_USER_DIRECTORY_TITLE));
 }
 
 void UserDataDirDialog::DeleteDelegate() {
@@ -64,8 +68,8 @@
 
 bool UserDataDirDialog::Accept() {
   // Directory picker
-  std::wstring dialog_title = l10n_util::GetString(
-      IDS_CANT_WRITE_USER_DIRECTORY_CHOOSE_DIRECTORY_BUTTON);
+  std::wstring dialog_title = UTF16ToWide(l10n_util::GetStringUTF16(
+      IDS_CANT_WRITE_USER_DIRECTORY_CHOOSE_DIRECTORY_BUTTON));
   HWND owning_hwnd =
       GetAncestor(message_box_view_->GetWidget()->GetNativeView(), GA_ROOT);
   select_file_dialog_->SelectFile(SelectFileDialog::SELECT_FOLDER,