Change std::wstring to string16 for views::Label and views::Link

chrome/browser/ui/views/default_search_view.cc

Index: chrome/browser/ui/views/default_search_view.cc
diff --git a/chrome/browser/ui/views/default_search_view.cc b/chrome/browser/ui/views/default_search_view.cc
index 8bfbfade49954b608ba89b79d4636adf50f0f416..cd6fba0dd46e7cbf1e337ebf6b97861464f6a45e 100644
--- a/chrome/browser/ui/views/default_search_view.cc
+++ b/chrome/browser/ui/views/default_search_view.cc
@@ -59,7 +59,7 @@ void GetShortNameAndLogoId(PrefService* prefs,
 
 views::Label* CreateProviderLabel(int message_id) {
   views::Label* choice_label =
-      new views::Label(UTF16ToWide(l10n_util::GetStringUTF16(message_id)));
+      new views::Label(l10n_util::GetStringUTF16(message_id));
   choice_label->SetColor(SK_ColorBLACK);
   choice_label->SetFont(
       choice_label->font().DeriveFont(1, gfx::Font::NORMAL));
@@ -279,9 +279,9 @@ void DefaultSearchView::SetupControls(PrefService* prefs) {
   // Add text informing the user about the requested default change.
   layout->StartRowWithPadding(0, kPaddedWholeDialogViewSetId,
                               1, views::kLabelToControlVerticalSpacing);
-  Label* summary_label = new Label(UTF16ToWide(l10n_util::GetStringFUTF16(
+  Label* summary_label = new Label(l10n_util::GetStringFUTF16(
       IDS_DEFAULT_SEARCH_SUMMARY,
-      WideToUTF16(proposed_short_name))));
+      WideToUTF16(proposed_short_name)));
   summary_label->SetColor(SK_ColorBLACK);
   summary_label->SetFont(
       summary_label->font().DeriveFont(1, gfx::Font::NORMAL));