base/version: remove wstring version

chrome/browser/ui/views/about_chrome_view.cc

Index: chrome/browser/ui/views/about_chrome_view.cc
diff --git a/chrome/browser/ui/views/about_chrome_view.cc b/chrome/browser/ui/views/about_chrome_view.cc
index 8e8723f53e05f2c0ed10e430099391a3475f4063..b86761d6e56bedb6d2fd6182518eb1fe1add0b96 100644
--- a/chrome/browser/ui/views/about_chrome_view.cc
+++ b/chrome/browser/ui/views/about_chrome_view.cc
@@ -156,16 +156,16 @@ void AboutChromeView::Init() {
     return;
   }
 
-  current_version_ = ASCIIToWide(version_info.Version());
+  current_version_ = version_info.Version();
 
   std::string version_modifier = platform_util::GetVersionStringModifier();
   if (!version_modifier.empty())
-    version_details_ += L" " + ASCIIToWide(version_modifier);
+    version_details_ += " " + version_modifier;
 
 #if !defined(GOOGLE_CHROME_BUILD)
-  version_details_ += L" (";
-  version_details_ += ASCIIToWide(version_info.LastChange());
-  version_details_ += L")";
+  version_details_ += " (";
+  version_details_ += version_info.LastChange();
+  version_details_ += ")";
 #endif
 
   // Views we will add to the *parent* of this dialog, since it will display
@@ -210,7 +210,7 @@ void AboutChromeView::Init() {
 
   // This is a text field so people can copy the version number from the dialog.
   version_label_ = new views::Textfield();
-  version_label_->SetText(WideToUTF16Hack(current_version_ + version_details_));
+  version_label_->SetText(ASCIIToUTF16(current_version_ + version_details_));
   version_label_->SetReadOnly(true);
   version_label_->RemoveBorder();
   version_label_->SetTextColor(SK_ColorBLACK);
@@ -750,8 +750,9 @@ void AboutChromeView::UpdateStatus(GoogleUpdateUpgradeResult result,
       BrowserDistribution* dist = BrowserDistribution::GetDistribution();
       scoped_ptr<installer::Version> installed_version(
           InstallUtil::GetChromeVersion(dist, false));
+      std::wstring version_wide = ASCIIToUTF16(current_version_);
       scoped_ptr<installer::Version> running_version(
-          installer::Version::GetVersionFromString(current_version_));
+          installer::Version::GetVersionFromString(version_wide));
       if (!installed_version.get() ||
           !installed_version->IsHigherThan(running_version.get())) {
 #endif
@@ -765,7 +766,7 @@ void AboutChromeView::UpdateStatus(GoogleUpdateUpgradeResult result,
         std::wstring update_label_text =
             l10n_util::GetStringF(IDS_UPGRADE_ALREADY_UP_TO_DATE,
                                   l10n_util::GetString(IDS_PRODUCT_NAME),
-                                  current_version_);
+                                  version_wide);
 #endif
         if (base::i18n::IsRTL()) {
           update_label_text.push_back(