Move UTF16ToASCII, remove WideToASCII.

chrome/browser/component_updater/component_patcher_win.cc

 // Copyright (c) 2013 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/browser/component_updater/component_patcher_win.h"
 
 #include <string>
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/process/kill.h"
 #include "base/process/launch.h"
 #include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/win/scoped_handle.h"
 #include "chrome/installer/util/util_constants.h"
 
 namespace component_updater {
 
 namespace {
 
 std::string PatchTypeToCommandLineSwitch(
     ComponentPatcher::PatchType patch_type) {
   if (patch_type == ComponentPatcher::kPatchTypeCourgette)
     return std::string(installer::kCourgette);
   else if (patch_type == ComponentPatcher::kPatchTypeBsdiff)
     return std::string(installer::kBsdiff);
   else
     return std::string();
 }
 
 // Finds the path to the setup.exe. First, it looks for the program in the
 // "installer" directory. If the program is not found there, it tries to find it
 // in the directory where chrome.dll lives. Returns the path to the setup.exe,
 // if the path exists, otherwise it returns an an empty path.
 base::FilePath FindSetupProgram() {
   base::FilePath exe_dir;
   if (!PathService::Get(base::DIR_MODULE, &exe_dir))
     return base::FilePath();
 
-  const std::string installer_dir(WideToASCII(installer::kInstallerDir));
-  const std::string setup_exe(WideToASCII(installer::kSetupExe));
+  const std::string installer_dir(base::UTF16ToASCII(installer::kInstallerDir));
+  const std::string setup_exe(base::UTF16ToASCII(installer::kSetupExe));
 
   base::FilePath setup_path = exe_dir;
   setup_path = setup_path.AppendASCII(installer_dir);
   setup_path = setup_path.AppendASCII(setup_exe);
   if (base::PathExists(setup_path))
     return setup_path;
 
   setup_path = exe_dir;
   setup_path = setup_path.AppendASCII(setup_exe);
   if (base::PathExists(setup_path))
@@ skipping 54 matching lines @@
     *error = GetLastError();
     return ComponentUnpacker::kDeltaPatchProcessFailure;
   }
 
   *error = exit_code;
   return *error ? ComponentUnpacker::kDeltaOperationFailure :
                   ComponentUnpacker::kNone;
 }
 
 }  // namespace component_updater