Remove wstring from l10n_util. Part 7....

chrome/browser/ui/views/generic_info_view.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/generic_info_view.h"
 
 #include "app/l10n_util.h"
+#include "base/logging.h"
+#include "base/utf_string_conversions.h"
 #include "gfx/color_utils.h"
-#include "base/logging.h"
 #include "views/grid_layout.h"
 #include "views/controls/label.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/standard_layout.h"
 
 GenericInfoView::GenericInfoView(int number_of_rows)
     : number_of_rows_(number_of_rows), name_string_ids_(NULL) {
   DCHECK(number_of_rows_ > 0);
 }
 
 GenericInfoView::GenericInfoView(
     int number_of_rows, const int name_string_ids[])
     : number_of_rows_(number_of_rows), name_string_ids_(name_string_ids) {
   DCHECK(number_of_rows_ > 0);
 }
 
 void GenericInfoView::SetNameByStringId(int row, int name_string_id) {
-  SetName(row, l10n_util::GetString(name_string_id));
+  SetName(row, UTF16ToWide(l10n_util::GetStringUTF16(name_string_id)));
 }
 
 void GenericInfoView::SetName(int row, const string16& name) {
   DCHECK(name_views_.get());  // Can only be called after Init time.
   DCHECK(row >= 0 && row < number_of_rows_);
   name_views_[row]->SetText(name);
 }
 
 void GenericInfoView::SetValue(int row, const string16& name) {
   DCHECK(value_views_.get());  // Can only be called after Init time.
@@ skipping 58 matching lines @@
   layout->AddView(value);
 
   // Color these borderless text areas the same as the containing dialog.
   SkColor text_area_background = color_utils::GetSysSkColor(COLOR_3DFACE);
 
   // Init them now that they're in the view hierarchy.
   value->SetReadOnly(true);
   value->RemoveBorder();
   value->SetBackgroundColor(text_area_background);
 }