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, 7 insertions, 6 deletions

diff --git a/chrome_frame/test_utils.cc b/chrome_frame/test_utils.cc
index 2d47c71..abfdbee 100644
--- a/chrome_frame/test_utils.cc
+++ b/chrome_frame/test_utils.cc
@@ -15,17 +15,18 @@
 
 // Statics
 
-std::wstring ScopedChromeFrameRegistrar::GetChromeFrameBuildPath() {
-  std::wstring build_path;
+FilePath ScopedChromeFrameRegistrar::GetChromeFrameBuildPath() {
+  FilePath build_path;
   PathService::Get(chrome::DIR_APP, &build_path);
-  file_util::AppendToPath(&build_path, L"servers\\npchrome_tab.dll");
+  build_path = build_path.Append(L"servers").
+                          Append(L"npchrome_tab.dll");
   file_util::PathExists(build_path);
   return build_path;
 }
 
 void ScopedChromeFrameRegistrar::RegisterDefaults() {
-  std::wstring dll_path_ = GetChromeFrameBuildPath();
-  RegisterAtPath(dll_path_);
+  FilePath dll_path = GetChromeFrameBuildPath();
+  RegisterAtPath(dll_path.value());
 }
 
 void ScopedChromeFrameRegistrar::RegisterAtPath(
@@ -56,7 +57,7 @@ void ScopedChromeFrameRegistrar::RegisterAtPath(
 // Non-statics
 
 ScopedChromeFrameRegistrar::ScopedChromeFrameRegistrar() {
-  original_dll_path_ = GetChromeFrameBuildPath();
+  original_dll_path_ = GetChromeFrameBuildPath().ToWStringHack();
   RegisterChromeFrameAtPath(original_dll_path_);
 }