Revert 184352

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/debug/trace_event.h"
 #include "base/environment.h"
@@ skipping 343 matching lines @@
   *out_file = dir;
   HMODULE dll = LoadChromeWithDirectory(out_file);
   if (dll)
     return dll;
 
   string16 version_string;
   Version version;
   const CommandLine& cmd_line = *CommandLine::ForCurrentProcess();
   if (cmd_line.HasSwitch(switches::kChromeVersion)) {
     version_string = cmd_line.GetSwitchValueNative(switches::kChromeVersion);
-    version = Version(base::WideToASCII(version_string));
+    version = Version(WideToASCII(version_string));
 
     if (!version.IsValid()) {
       // If a bogus command line flag was given, then abort.
       LOG(ERROR) << "Invalid command line version: " << version_string;
       return NULL;
     }
   }
 
   // If no version on the command line, then look at the version resource in
   // the current module and try loading that.
   if (!version.IsValid()) {
     scoped_ptr<FileVersionInfo> file_version_info(
         FileVersionInfo::CreateFileVersionInfoForCurrentModule());
     if (file_version_info.get()) {
       version_string = file_version_info->file_version();
-      version = Version(base::WideToASCII(version_string));
+      version = Version(WideToASCII(version_string));
     }
   }
 
   // TODO(robertshield): in theory, these next two checks (env and registry)
   // should never be needed. Remove them when I become 100% certain this is
   // also true in practice.
 
   // If no version in the current module, then look in the environment.
   if (!version.IsValid()) {
-    if (EnvQueryStr(base::ASCIIToWide(chrome::kChromeVersionEnvVar).c_str(),
+    if (EnvQueryStr(ASCIIToWide(chrome::kChromeVersionEnvVar).c_str(),
                     &version_string)) {
-      version = Version(base::WideToASCII(version_string));
+      version = Version(WideToASCII(version_string));
       LOG_IF(ERROR, !version.IsValid()) << "Invalid environment version: "
                                         << version_string;
     }
   }
 
   // If no version in the environment, then look in the registry.
   if (!version.IsValid()) {
     version_string = GetVersion();
     if (version_string.empty()) {
       LOG(ERROR) << "Could not get Chrome DLL version.";
@@ skipping 18 matching lines @@
 // add custom code in the OnBeforeLaunch callback.
 int MainDllLoader::Launch(HINSTANCE instance,
                           sandbox::SandboxInterfaceInfo* sbox_info) {
   string16 version;
   string16 file;
   dll_ = Load(&version, &file);
   if (!dll_)
     return chrome::RESULT_CODE_MISSING_DATA;
 
   scoped_ptr<base::Environment> env(base::Environment::Create());
-  env->SetVar(chrome::kChromeVersionEnvVar, base::WideToUTF8(version));
+  env->SetVar(chrome::kChromeVersionEnvVar, WideToUTF8(version));
   // TODO(erikwright): Remove this when http://crbug.com/174953 is fixed and
   // widely deployed.
   env->UnSetVar(env_vars::kGoogleUpdateIsMachineEnvVar);
 
   InitCrashReporter();
   OnBeforeLaunch(file);
 
   DLL_MAIN entry_point =
       reinterpret_cast<DLL_MAIN>(::GetProcAddress(dll_, "ChromeMain"));
   if (!entry_point)
@@ skipping 61 matching lines @@
   }
 };
 
 MainDllLoader* MakeMainDllLoader() {
 #if defined(GOOGLE_CHROME_BUILD)
   return new ChromeDllLoader();
 #else
   return new ChromiumDllLoader();
 #endif
 }