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

chrome_frame/chrome_tab.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.
 
 // chrome_tab.cc : Implementation of DLL Exports.
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/file_version_info.h"
 #include "base/logging.h"
@@ skipping 43 matching lines @@
       SYSTEMTIME local_time;
       ::GetSystemTime(&local_time);
       std::string hex(HexEncode(&local_time, sizeof(local_time)));
       base::StringPiece sp_hex(hex);
       hr = registrar->AddReplacement(L"SYSTIME",
                                      base::SysNativeMBToWide(sp_hex).c_str());
       DCHECK(SUCCEEDED(hr));
     }
 
     if (SUCCEEDED(hr)) {
-      FilePath app_path =
-          chrome_launcher::GetChromeExecutablePath().DirName();
-      hr = registrar->AddReplacement(L"CHROME_APPPATH",
-                                     app_path.value().c_str());
+      std::wstring app_path(
+          chrome_launcher::GetChromeExecutablePath());
+      app_path = file_util::GetDirectoryFromPath(app_path);
+      hr = registrar->AddReplacement(L"CHROME_APPPATH", app_path.c_str());
       DCHECK(SUCCEEDED(hr));
     }
 
     if (SUCCEEDED(hr)) {
       hr = registrar->AddReplacement(L"CHROME_APPNAME",
                                      chrome::kBrowserProcessExecutableName);
       DCHECK(SUCCEEDED(hr));
 
       // Fill in VERSION from the VERSIONINFO stored in the DLL's resources.
       scoped_ptr<FileVersionInfo> module_version_info(
@@ skipping 408 matching lines @@
     sd.GetDacl(&new_dacl);
     new_dacl.AddAllowedAce(token_.GetUser(), GENERIC_WRITE | GENERIC_READ);
     if (AtlSetDacl(object_name.c_str(), SE_REGISTRY_KEY, new_dacl)) {
       result = SetOrDeleteMimeHandlerKey(enable);
     }
   }
 
   backup.RestoreSecurity(object_name.c_str());
   return result;
 }