Move UTF16ToASCII, remove WideToASCII.

chrome/installer/util/installation_state.cc

Index: chrome/installer/util/installation_state.cc
diff --git a/chrome/installer/util/installation_state.cc b/chrome/installer/util/installation_state.cc
index d6d06abc5b1f8ce1bd32bb166f368aab96685626..91631b147375e6e9e8d51635141ef8fc183257b8 100644
--- a/chrome/installer/util/installation_state.cc
+++ b/chrome/installer/util/installation_state.cc
@@ -6,6 +6,7 @@
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/version.h"
 #include "base/win/registry.h"
 #include "chrome/installer/util/google_update_constants.h"
@@ -57,10 +58,10 @@ bool ProductState::Initialize(bool system_install,
   // Read from the Clients key.
   if (key.Open(root_key, version_key.c_str(),
                KEY_QUERY_VALUE) == ERROR_SUCCESS) {
-    std::wstring version_str;
+    base::string16 version_str;
     if (key.ReadValue(google_update::kRegVersionField,
                       &version_str) == ERROR_SUCCESS) {
-      version_.reset(new Version(WideToASCII(version_str)));
+      version_.reset(new Version(base::UTF16ToASCII(version_str)));
       if (!version_->IsValid())
         version_.reset();
     }
@@ -70,7 +71,7 @@ bool ProductState::Initialize(bool system_install,
     // only be accessible via InstallationState::GetNonVersionedProductState.
     if (key.ReadValue(google_update::kRegOldVersionField,
                       &version_str) == ERROR_SUCCESS) {
-      old_version_.reset(new Version(WideToASCII(version_str)));
+      old_version_.reset(new Version(base::UTF16ToASCII(version_str)));
       if (!old_version_->IsValid())
         old_version_.reset();
     }