Revert wstring patch (r29078 and follow up commits). It is causing failures o...

chrome/browser/first_run_win.cc

 // Copyright (c) 2006-2009 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/first_run.h"
 
 #include <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
@@ skipping 293 matching lines @@
 bool Upgrade::RelaunchChromeBrowser(const CommandLine& command_line) {
   ::SetEnvironmentVariable(google_update::kEnvProductVersionKey, NULL);
   return base::LaunchApp(command_line.command_line_string(),
                          false, false, NULL);
 }
 
 bool Upgrade::SwapNewChromeExeIfPresent() {
   std::wstring new_chrome_exe;
   if (!GetNewerChromeFile(&new_chrome_exe))
     return false;
-  if (!file_util::PathExists(FilePath::FromWStringHack(new_chrome_exe)))
+  if (!file_util::PathExists(new_chrome_exe))
     return false;
   std::wstring curr_chrome_exe;
   if (!PathService::Get(base::FILE_EXE, &curr_chrome_exe))
     return false;
 
   // First try to rename exe by launching rename command ourselves.
   bool user_install = InstallUtil::IsPerUserInstall(curr_chrome_exe.c_str());
   HKEY reg_root = user_install ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE;
   BrowserDistribution *dist = BrowserDistribution::GetDistribution();
   RegKey key;
@@ skipping 597 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(TryChromeDialog);
 };
 
 }  // namespace
 
 Upgrade::TryResult Upgrade::ShowTryChromeDialog(size_t version) {
   TryChromeDialog td(version);
   return td.ShowModal();
 }