Remove wstring from l10n_util. Part 8, the last part....

chrome/browser/chromeos/options/settings_page_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/chromeos/options/settings_page_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "gfx/skia_utils_gtk.h"
 #include "views/controls/label.h"
 #include "views/fill_layout.h"
 #include "views/widget/widget_gtk.h"
 
 namespace chromeos {
 
 SettingsPageView::SettingsPageView(Profile* profile)
     : OptionsPageView(profile) {
   SetLayoutManager(new views::FillLayout());
@@ skipping 39 matching lines @@
   column_set->AddColumn(GridLayout::LEADING, GridLayout::LEADING, 0,
                         GridLayout::USE_PREF, 0, 0);
   int inset_column_layout_id = 1;
   column_set = layout->AddColumnSet(inset_column_layout_id);
   column_set->AddPaddingColumn(0, kUnrelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::LEADING, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, single_column_layout_id);
   views::Label* title_label = new views::Label(
-      l10n_util::GetString(title_msg_id_));
+      UTF16ToWide(l10n_util::GetStringUTF16(title_msg_id_)));
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   gfx::Font title_font =
       rb.GetFont(ResourceBundle::BaseFont).DeriveFont(0, gfx::Font::BOLD);
   title_label->SetFont(title_font);
   layout->AddView(title_label);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   layout->StartRow(0, inset_column_layout_id);
 
   views::View* contents = new views::View;
   GridLayout* child_layout = new GridLayout(contents);
   contents->SetLayoutManager(child_layout);
 
   column_set = child_layout->AddColumnSet(single_column_view_set_id_);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   column_set = child_layout->AddColumnSet(double_column_view_set_id_);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   InitContents(child_layout);
   layout->AddView(contents);
 }
 
 }  // namespace chromeos