Revert 69490 - base/version: remove wstring version...

chrome_frame/dll_redirector.cc

 // Copyright (c) 2010 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_frame/dll_redirector.h"
 
 #include <aclapi.h>
 #include <atlbase.h>
 #include <atlsecurity.h>
 #include <sddl.h>
 
 #include "base/file_path.h"
 #include "base/file_version_info.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/shared_memory.h"
-#include "base/string_util.h"
 #include "base/sys_info.h"
 #include "base/utf_string_conversions.h"
 #include "base/version.h"
 #include "chrome_frame/utils.h"
 
 const wchar_t kSharedMemoryName[] = L"ChromeFrameVersionBeacon_";
 const uint32 kSharedMemorySize = 128;
 const uint32 kSharedMemoryLockTimeoutMs = 1000;
 
 // static
@@ skipping 213 matching lines @@
 }
 
 Version* DllRedirector::GetCurrentModuleVersion() {
   scoped_ptr<FileVersionInfo> file_version_info(
       FileVersionInfo::CreateFileVersionInfoForCurrentModule());
   DCHECK(file_version_info.get());
 
   Version* current_version = NULL;
   if (file_version_info.get()) {
      current_version = Version::GetVersionFromString(
-         WideToASCII(file_version_info->file_version()));
+        file_version_info->file_version());
     DCHECK(current_version);
   }
 
   return current_version;
 }
 
 HMODULE DllRedirector::GetFirstModule() {
   DCHECK(dll_version_.get())
       << "Error: Did you call RegisterAsFirstCFModule() first?";
 
@@ skipping 20 matching lines @@
                            .Append(module_name);
 
   HMODULE hmodule = LoadLibrary(module_path.value().c_str());
   if (hmodule == NULL) {
     DPLOG(ERROR) << "Could not load reported module version "
                  << version->GetString();
   }
 
   return hmodule;
 }