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

chrome_frame/test/perf/chrome_frame_perftest.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_frame/test/perf/chrome_frame_perftest.h"
 
 #include <atlwin.h>
 #include <atlhost.h>
 #include <map>
 #include <vector>
 #include <string>
@@ skipping 603 matching lines @@
     std::wstring chrome_exe_path =
         chrome_frame_registrar_->GetChromeFrameDllPath();
     EXPECT_FALSE(chrome_exe_path.empty());
 
     file_util::UpOneDirectory(&chrome_exe_path);
 
     std::wstring chrome_exe_test_path = chrome_exe_path;
     file_util::AppendToPath(&chrome_exe_test_path,
                             chrome::kBrowserProcessExecutableName);
 
-    if (!file_util::PathExists(
-        FilePath::FromWStringHack(chrome_exe_test_path))) {
+    if (!file_util::PathExists(chrome_exe_test_path)) {
       file_util::UpOneDirectory(&chrome_exe_path);
 
       chrome_exe_test_path = chrome_exe_path;
       file_util::AppendToPath(&chrome_exe_test_path,
                               chrome::kBrowserProcessExecutableName);
     }
 
-    EXPECT_TRUE(
-        file_util::PathExists(FilePath::FromWStringHack(chrome_exe_test_path)));
+    EXPECT_TRUE(file_util::PathExists(chrome_exe_test_path));
 
     return chrome_exe_path;
   }
 
   void InitiateNextNavigation() {
     if (browser_pid_ == 0) {
       std::wstring profile_directory;
       if (GetUserProfileBaseDirectory(&profile_directory)) {
         file_util::AppendToPath(&profile_directory,
                                 GetHostProcessName(false));
@@ skipping 485 matching lines @@
   ASSERT_TRUE(silverlight_key.ReadValue(L"", &plugin_path));
   ASSERT_FALSE(plugin_path.empty());
 
   FilePath silverlight_path = FilePath::FromWStringHack(plugin_path);
   FilePath binaries_to_evict[] = {silverlight_path};
 
   RunStartupTest("creation_cold", "t_silverlight", "", true /* cold */,
                  arraysize(binaries_to_evict), binaries_to_evict,
                  false /* important */, true);
 }