Move UTF16ToASCII, remove WideToASCII.

chrome/app/client_util.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 <windows.h>
 #include <shlwapi.h>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/debug/trace_event.h"
@@ skipping 190 matching lines @@
     return base::string16();
   base::string16 exe_path(path);
   return exe_path.append(1, L'\\');
 }
 
 base::string16 GetCurrentModuleVersion() {
   scoped_ptr<FileVersionInfo> file_version_info(
       FileVersionInfo::CreateFileVersionInfoForCurrentModule());
   if (file_version_info.get()) {
     base::string16 version_string(file_version_info->file_version());
-    if (Version(WideToASCII(version_string)).IsValid())
+    if (Version(base::UTF16ToASCII(version_string)).IsValid())
       return version_string;
   }
   return base::string16();
 }
 
 //=============================================================================
 
 MainDllLoader::MainDllLoader()
   : dll_(NULL), metro_mode_(InMetroMode()) {
 }
@@ skipping 140 matching lines @@
   }
 };
 
 MainDllLoader* MakeMainDllLoader() {
 #if defined(GOOGLE_CHROME_BUILD)
   return new ChromeDllLoader();
 #else
   return new ChromiumDllLoader();
 #endif
 }