Remove wstring from l10n_util. Part 7....

chrome/browser/ui/views/about_chrome_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/about_chrome_view.h"
 
 #if defined(OS_WIN)
 #include <commdlg.h>
 #endif  // defined(OS_WIN)
 
@@ skipping 701 matching lines @@
   bool show_success_indicator = false;
   bool show_update_available_indicator = false;
   bool show_timeout_indicator = false;
   bool show_throbber = false;
   bool show_update_label = true;  // Always visible, except at start.
 
   switch (result) {
     case UPGRADE_STARTED:
       UserMetrics::RecordAction(UserMetricsAction("Upgrade_Started"), profile_);
       show_throbber = true;
-      update_label_.SetText(l10n_util::GetString(IDS_UPGRADE_STARTED));
+      update_label_.SetText(
+          UTF16ToWide(l10n_util::GetStringUTF16(IDS_UPGRADE_STARTED)));
       break;
     case UPGRADE_CHECK_STARTED:
       UserMetrics::RecordAction(UserMetricsAction("UpgradeCheck_Started"),
                                 profile_);
       show_throbber = true;
-      update_label_.SetText(l10n_util::GetString(IDS_UPGRADE_CHECK_STARTED));
+      update_label_.SetText(
+          UTF16ToWide(l10n_util::GetStringUTF16(IDS_UPGRADE_CHECK_STARTED)));
       break;
     case UPGRADE_IS_AVAILABLE:
       UserMetrics::RecordAction(
           UserMetricsAction("UpgradeCheck_UpgradeIsAvailable"), profile_);
       DCHECK(!google_updater_);  // Should have been nulled out already.
       google_updater_ = new GoogleUpdate();
       google_updater_->set_status_listener(this);
       UpdateStatus(UPGRADE_STARTED, GOOGLE_UPDATE_NO_ERROR);
       // CheckForUpdate(true,...) means perform upgrade if new version found.
       google_updater_->CheckForUpdate(true, window());
@@ skipping 14 matching lines @@
       scoped_ptr<Version> installed_version(
           InstallUtil::GetChromeVersion(dist, false));
       scoped_ptr<Version> running_version(
           Version::GetVersionFromString(current_version_));
       if (!installed_version.get() ||
           (installed_version->CompareTo(*running_version) < 0)) {
 #endif
         UserMetrics::RecordAction(
             UserMetricsAction("UpgradeCheck_AlreadyUpToDate"), profile_);
 #if defined(OS_CHROMEOS)
-        std::wstring update_label_text =
-            l10n_util::GetStringF(IDS_UPGRADE_ALREADY_UP_TO_DATE,
-                                  l10n_util::GetString(IDS_PRODUCT_NAME));
+        std::wstring update_label_text = UTF16ToWide(l10n_util::GetStringFUTF16(
+            IDS_UPGRADE_ALREADY_UP_TO_DATE,
+            l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
 #else
-        std::wstring update_label_text =
-            l10n_util::GetStringF(IDS_UPGRADE_ALREADY_UP_TO_DATE,
-                                  l10n_util::GetString(IDS_PRODUCT_NAME),
-                                  ASCIIToUTF16(current_version_));
+        std::wstring update_label_text = l10n_util::GetStringFUTF16(
+            IDS_UPGRADE_ALREADY_UP_TO_DATE,
+            l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
+            ASCIIToUTF16(current_version_));
 #endif
         if (base::i18n::IsRTL()) {
           update_label_text.push_back(
               static_cast<wchar_t>(base::i18n::kLeftToRightMark));
         }
         update_label_.SetText(update_label_text);
         show_success_indicator = true;
         break;
 #if defined(OS_WIN)
       }
 #endif
       // No break here as we want to notify user about upgrade if there is one.
     }
     case UPGRADE_SUCCESSFUL: {
       if (result == UPGRADE_ALREADY_UP_TO_DATE)
         UserMetrics::RecordAction(
             UserMetricsAction("UpgradeCheck_AlreadyUpgraded"), profile_);
       else
         UserMetrics::RecordAction(UserMetricsAction("UpgradeCheck_Upgraded"),
                                   profile_);
       restart_button_visible_ = true;
       const std::wstring& update_string =
-          l10n_util::GetStringF(IDS_UPGRADE_SUCCESSFUL_RESTART,
-                                l10n_util::GetString(IDS_PRODUCT_NAME));
+          UTF16ToWide(l10n_util::GetStringFUTF16(
+              IDS_UPGRADE_SUCCESSFUL_RESTART,
+              l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
       update_label_.SetText(update_string);
       show_success_indicator = true;
       break;
     }
     case UPGRADE_ERROR:
       UserMetrics::RecordAction(UserMetricsAction("UpgradeCheck_Error"),
                                 profile_);
       restart_button_visible_ = false;
-      update_label_.SetText(l10n_util::GetStringF(IDS_UPGRADE_ERROR,
-          UTF8ToWide(base::IntToString(error_code))));
+      update_label_.SetText(UTF16ToWide(
+          l10n_util::GetStringFUTF16Int(IDS_UPGRADE_ERROR, error_code)));
       show_timeout_indicator = true;
       break;
     default:
       NOTREACHED();
   }
 
   success_indicator_.SetVisible(show_success_indicator);
   update_available_indicator_.SetVisible(show_update_available_indicator);
   timeout_indicator_.SetVisible(show_timeout_indicator);
   update_label_.SetVisible(show_update_label);
   throbber_->SetVisible(show_throbber);
   if (show_throbber)
     throbber_->Start();
   else
     throbber_->Stop();
 
   // We have updated controls on the parent, so we need to update its layout.
   View* parent = GetParent();
   parent->Layout();
 
   // Check button may have appeared/disappeared. We cannot call this during
   // ViewHierarchyChanged because the |window()| pointer hasn't been set yet.
   if (window())
     GetDialogClientView()->UpdateDialogButtons();
 }
 
 #endif