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

chrome/browser/chromeos/login/update_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/login/update_view.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
 #include "chrome/browser/chromeos/login/update_screen.h"
 #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "views/border.h"
 #include "views/controls/label.h"
 #include "views/controls/progress_bar.h"
 #include "views/controls/throbber.h"
@@ skipping 77 matching lines @@
 
   UpdateLocalizedStrings();
   UpdateVisibility();
 }
 
 void UpdateView::Reset() {
   progress_bar_->SetProgress(0);
 }
 
 void UpdateView::UpdateLocalizedStrings() {
-  installing_updates_label_->SetText(
-      l10n_util::GetStringF(IDS_INSTALLING_UPDATE,
-                            l10n_util::GetString(IDS_PRODUCT_OS_NAME)));
-  reboot_label_->SetText(l10n_util::GetString(IDS_INSTALLING_UPDATE_DESC));
-  manual_reboot_label_->SetText(l10n_util::GetString(IDS_UPDATE_COMPLETED));
-  checking_label_->SetText(l10n_util::GetString(IDS_CHECKING_FOR_UPDATES));
+  installing_updates_label_->SetText(UTF16ToWide(l10n_util::GetStringFUTF16(
+      IDS_INSTALLING_UPDATE,
+      l10n_util::GetStringUTF16(IDS_PRODUCT_OS_NAME))));
+  reboot_label_->SetText(
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_INSTALLING_UPDATE_DESC)));
+  manual_reboot_label_->SetText(
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_UPDATE_COMPLETED)));
+  checking_label_->SetText(
+      UTF16ToWide(l10n_util::GetStringUTF16(IDS_CHECKING_FOR_UPDATES)));
 }
 
 void UpdateView::AddProgress(int ticks) {
   progress_bar_->AddProgress(ticks);
 }
 
 void UpdateView::SetProgress(int progress) {
   progress_bar_->SetProgress(progress);
 }
 
@@ skipping 96 matching lines @@
   checking_label_->SetVisible(show_curtain_);
   throbber_->SetVisible(show_curtain_);
   if (show_curtain_) {
     throbber_->Start();
   } else {
     throbber_->Stop();
   }
 }
 
 }  // namespace chromeos