Move UTF16ToASCII, remove WideToASCII.

chrome/installer/util/installer_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/installer_state.h"
 
 #include <algorithm>
 #include <functional>
 #include <utility>
 
@@ skipping 644 matching lines @@
     installer::kChromeOldExe,
   };
 
   for (int i = 0; i < arraysize(kChromeFilenames); ++i) {
     base::FilePath chrome_exe(target_path().Append(kChromeFilenames[i]));
     scoped_ptr<FileVersionInfo> file_version_info(
         FileVersionInfo::CreateFileVersionInfo(chrome_exe));
     if (file_version_info) {
       base::string16 version_string = file_version_info->file_version();
       if (!version_string.empty() && IsStringASCII(version_string))
-        existing_versions->insert(WideToASCII(version_string));
+        existing_versions->insert(base::UTF16ToASCII(version_string));
     }
   }
 }
 
 void InstallerState::RemoveOldVersionDirectories(
     const Version& new_version,
     Version* existing_version,
     const base::FilePath& temp_path) const {
   Version version;
   scoped_ptr<WorkItem> item;
 
   std::set<std::string> existing_version_strings;
   existing_version_strings.insert(new_version.GetString());
   if (existing_version)
     existing_version_strings.insert(existing_version->GetString());
 
   // Make sure not to delete any version dir that is "referenced" by an existing
   // Chrome executable.
   GetExistingExeVersions(&existing_version_strings);
 
   // Try to delete all directories that are not in the set we care to keep.
   base::FileEnumerator version_enum(target_path(), false,
                                     base::FileEnumerator::DIRECTORIES);
   for (base::FilePath next_version = version_enum.Next(); !next_version.empty();
        next_version = version_enum.Next()) {
     base::FilePath dir_name(next_version.BaseName());
-    version = Version(WideToASCII(dir_name.value()));
+    version = Version(base::UTF16ToASCII(dir_name.value()));
     // Delete the version folder if it is less than the new version and not
     // equal to the old version (if we have an old version).
     if (version.IsValid() &&
         existing_version_strings.count(version.GetString()) == 0) {
       // Note: temporarily log old version deletion at ERROR level to make it
       // more likely we see this in the installer log.
       LOG(ERROR) << "Deleting old version directory: " << next_version.value();
 
       // Attempt to recursively delete the old version dir.
       bool delete_succeeded = base::DeleteFile(next_version, true);
@@ skipping 120 matching lines @@
   }
   if (!install_list->Do())
     LOG(ERROR) << "Failed to record installer error information in registry.";
 }
 
 bool InstallerState::RequiresActiveSetup() const {
   return system_install() && FindProduct(BrowserDistribution::CHROME_BROWSER);
 }
 
 }  // namespace installer