Move UTF16ToASCII, remove WideToASCII.

chrome/installer/test/alternate_version_generator.cc

 // Copyright (c) 2011 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.
 
 // The file contains the implementation of the mini_installer re-versioner.
 // The main function (GenerateNextVersion) does the following in a temp dir:
 // - Extracts and unpacks setup.exe and the Chrome-bin folder from
 //   mini_installer.exe.
 // - Inspects setup.exe to determine the current version.
 // - Runs through all .dll and .exe files:
@@ skipping 24 matching lines @@
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/process/launch.h"
 #include "base/process/process_handle.h"
 #include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/version.h"
 #include "base/win/pe_image.h"
 #include "base/win/scoped_handle.h"
 #include "chrome/installer/test/pe_image_resources.h"
 #include "chrome/installer/test/resource_loader.h"
 #include "chrome/installer/test/resource_updater.h"
 #include "chrome/installer/util/lzma_util.h"
 
 namespace {
 
@@ skipping 605 matching lines @@
     return false;
   }
   ctx.current_version_str = ctx.current_version.ToString();
 
   if (!IncrementNewVersion(direction, &ctx)) {
     LOG(DFATAL) << "Failed to increment version from \""
                 << original_file.value() << "\"";
     return false;
   }
 
-  Version new_version(WideToASCII(ctx.new_version_str));
+  Version new_version(base::UTF16ToASCII(ctx.new_version_str));
   GenerateSpecificPEFileVersion(original_file, target_file, new_version);
 
   return true;
 }
 
 bool GenerateSpecificPEFileVersion(const base::FilePath& original_file,
                                    const base::FilePath& target_file,
                                    const Version& version) {
   // First copy original_file to target_file.
   if (!base::CopyFile(original_file, target_file)) {
     LOG(DFATAL) << "Failed copying \"" << original_file.value()
                 << "\" to \"" << target_file.value() << "\"";
     return false;
   }
 
   VisitResourceContext ctx;
   if (!GetFileVersion(target_file, &ctx.current_version)) {
     LOG(DFATAL) << "Failed reading version from \"" << target_file.value()
                 << "\"";
     return false;
   }
   ctx.current_version_str = ctx.current_version.ToString();
   ctx.new_version = ChromeVersion::FromString(version.GetString());
   ctx.new_version_str = ctx.new_version.ToString();
 
   return UpdateVersionIfMatch(target_file, &ctx);
 }
 
 }  // namespace upgrade_test