From 66ff7356a381d6c8c6c3272b095938408c4f3188 Mon Sep 17 00:00:00 2001 From: "estade@chromium.org" Date: Thu, 15 Oct 2009 05:09:50 +0000 Subject: Re-try r29078: Remove some deprecated file_util wstring functions. With the previous patch, the try bots failed with mysterious messages, so I ignored them, patched it into my windows box and tested it there manually, and found no problems. As it turns out, the try failures were real :(. But nsylvain and I found the problem: the behavior of file_util::GetDirectoryFromPath() differs from DirName() when the path is empty (officially, GetDirectoryFromPath is not supposed to support non-absolute paths, but that is not enforced). Here is a green win try result: http://build.chromium.org/buildbot/try-server/builders/win/builds/3705 mac: http://build.chromium.org/buildbot/try-server/builders/mac/builds/3491 linux: http://build.chromium.org/buildbot/try-server/builders/linux/builds/3466 I also applied this patch locally in Windows to test that it doesn't break the chrome frame compile or tests, since that's not covered by the trybots yet. Review URL: http://codereview.chromium.org/271099 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29094 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/printing/printing_layout_uitest.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'chrome/browser/printing/printing_layout_uitest.cc') diff --git a/chrome/browser/printing/printing_layout_uitest.cc b/chrome/browser/printing/printing_layout_uitest.cc index a5de41a..c3bfb6b 100644 --- a/chrome/browser/printing/printing_layout_uitest.cc +++ b/chrome/browser/printing/printing_layout_uitest.cc @@ -73,7 +73,8 @@ class PrintingLayoutTest : public PrintingTest { FilePath png(verification_file + L".png"); // Looks for Cleartype override. - if (file_util::PathExists(verification_file + L"_cleartype.png") && + if (file_util::PathExists( + FilePath::FromWStringHack(verification_file + L"_cleartype.png")) && IsClearTypeEnabled()) { png = FilePath(verification_file + L"_cleartype.png"); } -- cgit v1.1