Move UTF16ToASCII, remove WideToASCII.

chrome/installer/util/installation_state.cc

 // Copyright (c) 2012 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/installer/util/installation_state.h"
 
 #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"
 #include "chrome/installer/util/install_util.h"
 
 namespace installer {
 
 ProductState::ProductState()
     : uninstall_command_(CommandLine::NO_PROGRAM),
       eula_accepted_(0),
@@ skipping 31 matching lines @@
   const std::wstring state_key(distribution->GetStateKey());
   const HKEY root_key = system_install ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
   base::win::RegKey key;
 
   // Clear the runway.
   Clear();
 
   // 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();
     }
 
     // Attempt to read the other values even if the "pv" version value was
     // absent. Note that ProductState instances containing these values will
     // 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();
     }
 
     key.ReadValue(google_update::kRegRenameCmdField, &rename_cmd_);
     if (!InitializeCommands(key, &commands_))
       commands_.Clear();
   }
 
   // Read from the ClientState key.
@@ skipping 184 matching lines @@
 }
 
 const ProductState* InstallationState::GetProductState(
     bool system_install,
     BrowserDistribution::Type type) const {
   const ProductState* product_state =
       GetNonVersionedProductState(system_install, type);
   return product_state->version_.get() == NULL ? NULL : product_state;
 }
 }  // namespace installer