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

chrome_frame/chrome_launcher.cc

 // Copyright (c) 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_frame/chrome_launcher.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 72 matching lines @@
   std::wstring command_line_with_program(L"dummy.exe ");
   command_line_with_program += command_line;
   CommandLine original(L"");
   original.ParseFromString(command_line_with_program);
   CommandLine sanitized(GetChromeExecutablePath());
   SanitizeCommandLine(original, &sanitized);
 
   return base::LaunchApp(sanitized.command_line_string(), false, false, NULL);
 }
 
-FilePath GetChromeExecutablePath() {
-  FilePath cur_path;
+std::wstring GetChromeExecutablePath() {
+  std::wstring cur_path;
   PathService::Get(base::DIR_MODULE, &cur_path);
-  cur_path = cur_path.Append(chrome::kBrowserProcessExecutableName);
+  file_util::AppendToPath(&cur_path, chrome::kBrowserProcessExecutableName);
 
   // The installation model for Chrome places the DLLs in a versioned
   // sub-folder one down from the Chrome executable. If we fail to find
   // chrome.exe in the current path, try looking one up and launching that
   // instead.
   if (!file_util::PathExists(cur_path)) {
     PathService::Get(base::DIR_MODULE, &cur_path);
-    cur_path = cur_path.DirName().Append(chrome::kBrowserProcessExecutableName);
+    file_util::UpOneDirectory(&cur_path);
+    file_util::AppendToPath(&cur_path, chrome::kBrowserProcessExecutableName);
   }
 
   return cur_path;
 }
 
 }  // namespace chrome_launcher
 
 // Entrypoint that implements the logic of chrome_launcher.exe.
 int CALLBACK CfLaunchChrome() {
   if (chrome_launcher::SanitizeAndLaunchChrome(::GetCommandLine())) {
     return ERROR_SUCCESS;
   } else {
     return ERROR_OPEN_FAILED;
   }
 }
 
 // Compile-time check to see that the type CfLaunchChromeProc is correct.
 #ifndef NODEBUG
 namespace {
 chrome_launcher::CfLaunchChromeProc cf_launch_chrome = CfLaunchChrome;
 }  // namespace
 #endif  // NODEBUG