Remove wstring from l10n_util. Part 7....

chrome/browser/ui/views/default_search_view.cc

Index: chrome/browser/ui/views/default_search_view.cc
===================================================================
--- chrome/browser/ui/views/default_search_view.cc	(revision 70562)
+++ chrome/browser/ui/views/default_search_view.cc	(working copy)
@@ -57,7 +57,7 @@
 
 views::Label* CreateProviderLabel(int message_id) {
   views::Label* choice_label =
-      new views::Label(l10n_util::GetString(message_id));
+      new views::Label(UTF16ToWide(l10n_util::GetStringUTF16(message_id)));
   choice_label->SetColor(SK_ColorBLACK);
   choice_label->SetFont(
       choice_label->font().DeriveFont(1, gfx::Font::NORMAL));
@@ -101,8 +101,8 @@
     views::ButtonListener* listener,
     int message_id,
     const std::wstring& short_name) {
-  return new views::NativeButton(listener, l10n_util::GetStringF(
-      message_id, short_name));
+  return new views::NativeButton(listener, UTF16ToWide(
+      l10n_util::GetStringFUTF16(message_id, WideToUTF16(short_name))));
 }
 
 }  // namespace
@@ -144,7 +144,7 @@
 }
 
 std::wstring DefaultSearchView::GetWindowTitle() const {
-  return l10n_util::GetString(IDS_DEFAULT_SEARCH_TITLE);
+  return UTF16ToWide(l10n_util::GetStringUTF16(IDS_DEFAULT_SEARCH_TITLE));
 }
 
 views::View* DefaultSearchView::GetInitiallyFocusedView() {
@@ -264,9 +264,9 @@
   // Add text informing the user about the requested default change.
   layout->StartRowWithPadding(0, kPaddedWholeDialogViewSetId,
                               1, kLabelToControlVerticalSpacing);
-  Label* summary_label = new Label(l10n_util::GetStringF(
+  Label* summary_label = new Label(UTF16ToWide(l10n_util::GetStringFUTF16(
       IDS_DEFAULT_SEARCH_SUMMARY,
-      proposed_short_name));
+      WideToUTF16(proposed_short_name))));
   summary_label->SetColor(SK_ColorBLACK);
   summary_label->SetFont(
       summary_label->font().DeriveFont(1, gfx::Font::NORMAL));