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

chrome/browser/printing/printing_layout_uitest.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 "app/gfx/gdi_util.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/simple_thread.h"
 #include "base/win_util.h"
 #include "chrome/common/chrome_paths.h"
@@ skipping 55 matching lines @@
       return 100.;
     }
 
     std::wstring verification_file(test_data_directory_.ToWStringHack());
     file_util::AppendToPath(&verification_file, L"printing");
     file_util::AppendToPath(&verification_file, verification_name);
     FilePath emf(verification_file + L".emf");
     FilePath png(verification_file + L".png");
 
     // Looks for Cleartype override.
-    if (file_util::PathExists(
-            FilePath::FromWStringHack(verification_file + L"_cleartype.png")) &&
+    if (file_util::PathExists(verification_file + L"_cleartype.png") &&
         IsClearTypeEnabled()) {
       png = FilePath(verification_file + L"_cleartype.png");
     }
 
     if (GenerateFiles()) {
       // Copy the .emf and generate an .png.
       file_util::CopyFile(test_result, emf);
       Image emf_content(emf.value());
       emf_content.SaveToPng(png);
       // Saving is always fine.
@@ skipping 356 matching lines @@
 
     // Force a navigation elsewhere to verify that it's fine with it.
     url = server->TestServerPage("files/printing/test1.html");
     EXPECT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS,
               tab_proxy->NavigateToURL(url));
   }
   CloseBrowserAndServer();
 
   EXPECT_EQ(0., CompareWithResult(L"iframe")) << L"iframe";
 }