Remove wstring from l10n_util. Part 7....

chrome/browser/ui/views/url_picker.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/views/url_picker.h"
 
 #include "app/keyboard_codes.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/table_model.h"
@@ skipping 70 matching lines @@
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   column_set = layout->AddColumnSet(single_column_view_set_id);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::FIXED, kTableWidth, 0);
 
   layout->StartRow(0, labels_column_set_id);
   views::Label* url_label = new views::Label();
   url_label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
-  url_label->SetText(l10n_util::GetString(IDS_ASI_URL));
+  url_label->SetText(UTF16ToWide(l10n_util::GetStringUTF16(IDS_ASI_URL)));
   layout->AddView(url_label);
 
   url_field_ = new views::Textfield();
   url_field_->SetController(this);
   layout->AddView(url_field_);
 
   layout->AddPaddingRow(0, kUnrelatedControlVerticalSpacing);
 
   layout->StartRow(0, single_column_view_set_id);
   views::Label* description_label = new views::Label();
   description_label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
-  description_label->SetText(l10n_util::GetString(IDS_ASI_DESCRIPTION));
+  description_label->SetText(
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_ASI_DESCRIPTION)));
   description_label->SetFont(
       description_label->font().DeriveFont(0, gfx::Font::BOLD));
   layout->AddView(description_label);
 
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 
   layout->StartRow(1, single_column_view_set_id);
   layout->AddView(url_table_);
 
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
@@ skipping 12 matching lines @@
   url_field_->RequestFocus();
   url_table_model_->Reload(profile_);
 }
 
 void UrlPicker::Close() {
   DCHECK(window());
   window()->Close();
 }
 
 std::wstring UrlPicker::GetWindowTitle() const {
-  return l10n_util::GetString(IDS_ASI_ADD_TITLE);
+  return UTF16ToWide(l10n_util::GetStringUTF16(IDS_ASI_ADD_TITLE));
 }
 
 bool UrlPicker::IsModal() const {
   return true;
 }
 
 std::wstring UrlPicker::GetDialogButtonLabel(
     MessageBoxFlags::DialogButton button) const {
   if (button == MessageBoxFlags::DIALOGBUTTON_OK)
-    return l10n_util::GetString(IDS_ASI_ADD);
+    return UTF16ToWide(l10n_util::GetStringUTF16(IDS_ASI_ADD));
   return std::wstring();
 }
 
 void UrlPicker::ContentsChanged(views::Textfield* sender,
                                 const std::wstring& new_contents) {
   GetDialogClientView()->UpdateDialogButtons();
 }
 
 bool UrlPicker::Accept() {
   if (!IsDialogButtonEnabled(MessageBoxFlags::DIALOGBUTTON_OK)) {
@@ skipping 82 matching lines @@
     PerformModelChange();
     if (window())
       window()->Close();
   }
 }
 
 GURL UrlPicker::GetInputURL() const {
   return URLFixerUpper::FixupURL(UTF16ToUTF8(url_field_->text()),
                                  std::string());
 }