Remove wstring from l10n_util. Part 7....

chrome/browser/ui/views/update_recommended_message_box.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/update_recommended_message_box.h"
 
 #include "app/l10n_util.h"
 #include "app/message_box_flags.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/views/window.h"
 #include "chrome/common/pref_names.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "views/controls/message_box_view.h"
 #include "views/window/window.h"
 
@@ skipping 29 matching lines @@
 int UpdateRecommendedMessageBox::GetDialogButtons() const {
   return MessageBoxFlags::DIALOGBUTTON_OK |
          MessageBoxFlags::DIALOGBUTTON_CANCEL;
 }
 
 std::wstring UpdateRecommendedMessageBox::GetDialogButtonLabel(
     MessageBoxFlags::DialogButton button) const {
   DCHECK(button == MessageBoxFlags::DIALOGBUTTON_OK ||
          button == MessageBoxFlags::DIALOGBUTTON_CANCEL);
   return button == MessageBoxFlags::DIALOGBUTTON_OK ?
-      l10n_util::GetString(IDS_RESTART_AND_UPDATE) :
-      l10n_util::GetString(IDS_NOT_NOW);
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_RESTART_AND_UPDATE)) :
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_NOT_NOW));
 }
 
 std::wstring UpdateRecommendedMessageBox::GetWindowTitle() const {
-  return l10n_util::GetString(IDS_PRODUCT_NAME);
+  return UTF16ToWide(l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
 }
 
 void UpdateRecommendedMessageBox::DeleteDelegate() {
   delete this;
 }
 
 bool UpdateRecommendedMessageBox::IsModal() const {
   return true;
 }
 
 views::View* UpdateRecommendedMessageBox::GetContentsView() {
   return message_box_view_;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // UpdateRecommendedMessageBox, private:
 
 UpdateRecommendedMessageBox::UpdateRecommendedMessageBox(
     gfx::NativeWindow parent_window) {
   const int kDialogWidth = 400;
 #if defined(OS_CHROMEOS)
-  const std::wstring product_name = l10n_util::GetString(IDS_PRODUCT_OS_NAME);
+  const int kProductNameId = IDS_PRODUCT_OS_NAME;
 #else
-  const std::wstring product_name = l10n_util::GetString(IDS_PRODUCT_NAME);
+  const int kProductNameId = IDS_PRODUCT_NAME;
 #endif
+  const string16 product_name = l10n_util::GetStringUTF16(kProductNameId);
   // Also deleted when the window closes.
   message_box_view_ = new MessageBoxView(
       MessageBoxFlags::kFlagHasMessage | MessageBoxFlags::kFlagHasOKButton,
-      l10n_util::GetStringF(IDS_UPDATE_RECOMMENDED, product_name),
+      UTF16ToWide(l10n_util::GetStringFUTF16(IDS_UPDATE_RECOMMENDED,
+                                             product_name)),
       std::wstring(),
       kDialogWidth);
   browser::CreateViewsWindow(parent_window, gfx::Rect(), this)->Show();
 }
 
 UpdateRecommendedMessageBox::~UpdateRecommendedMessageBox() {
 }