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

1 files changed, 3 insertions, 1 deletions

diff --git a/chrome_frame/test_utils.h b/chrome_frame/test_utils.h
index fb470a0..85f5cc5 100644
--- a/chrome_frame/test_utils.h
+++ b/chrome_frame/test_utils.h
@@ -7,6 +7,8 @@
 
 #include <string>
 
+#include "base/file_path.h"
+
 // Helper class used to register different chrome frame DLLs while running
 // tests. At construction, this registers the DLL found in the build path.
 // At destruction, again registers the DLL found in the build path if another
@@ -24,7 +26,7 @@ class ScopedChromeFrameRegistrar {
 
   std::wstring GetChromeFrameDllPath() const;
 
-  static std::wstring GetChromeFrameBuildPath();
+  static FilePath GetChromeFrameBuildPath();
   static void RegisterAtPath(const std::wstring& path);
   static void RegisterDefaults();