Deprecate more old filepath functions.

webkit/tools/test_shell/test_shell.cc

 // Copyright (c) 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.
 
 #undef LOG
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 307 matching lines @@
       printf("#MD5:%s\n", md5sum.c_str());
     }
     if (dumped_anything)
       printf("#EOF\n");
     fflush(stdout);
   }
 }
 
 // static
 std::string TestShell::DumpImage(skia::PlatformCanvas* canvas,
-    const std::wstring& file_name, const std::string& pixel_hash) {
+    const FilePath& path, const std::string& pixel_hash) {
   skia::BitmapPlatformDevice& device =
       static_cast<skia::BitmapPlatformDevice&>(canvas->getTopPlatformDevice());
   const SkBitmap& src_bmp = device.accessBitmap(false);
 
   // Encode image.
   std::vector<unsigned char> png;
   SkAutoLockPixels src_bmp_lock(src_bmp);
   gfx::PNGCodec::ColorFormat color_format = gfx::PNGCodec::FORMAT_BGRA;
 
   // Fix the alpha. The expected PNGs on Mac have an alpha channel, so we want
@@ skipping 25 matching lines @@
 
   // Only encode and dump the png if the hashes don't match. Encoding the image
   // is really expensive.
   if (md5hash.compare(pixel_hash) != 0) {
     gfx::PNGCodec::Encode(
         reinterpret_cast<const unsigned char*>(src_bmp.getPixels()),
         color_format, src_bmp.width(), src_bmp.height(),
         static_cast<int>(src_bmp.rowBytes()), discard_transparency, &png);
 
     // Write to disk.
-    file_util::WriteFile(file_name, reinterpret_cast<const char *>(&png[0]),
+    file_util::WriteFile(path, reinterpret_cast<const char *>(&png[0]),
                          png.size());
   }
 
   return md5hash;
 }
 
 // static
 void TestShell::InitLogging(bool suppress_error_dialogs,
                             bool layout_test_mode,
                             bool enable_gp_fault_error_box) {
@@ skipping 300 matching lines @@
   SetFocus(webViewHost(), true);
 
   return true;
 }
 
 void TestShell::GoBackOrForward(int offset) {
     navigation_controller_->GoToOffset(offset);
 }
 
 void TestShell::DumpDocumentText() {
-  std::wstring file_path;
+  FilePath file_path;
   if (!PromptForSaveFile(L"Dump document text", &file_path))
       return;
 
   const std::string data =
       WideToUTF8(webkit_glue::DumpDocumentText(webView()->mainFrame()));
   file_util::WriteFile(file_path, data.c_str(), data.length());
 }
 
 void TestShell::DumpRenderTree() {
-  std::wstring file_path;
+  FilePath file_path;
   if (!PromptForSaveFile(L"Dump render tree", &file_path))
     return;
 
   const std::string data =
       WideToUTF8(webkit_glue::DumpRenderer(webView()->mainFrame()));
   file_util::WriteFile(file_path, data.c_str(), data.length());
 }
 
 std::wstring TestShell::GetDocumentText() {
   return webkit_glue::DumpDocumentText(webView()->mainFrame());
@@ skipping 91 matching lines @@
 
 std::string GetProductVersion() {
   return std::string("Chrome/0.0.0.0");
 }
 
 bool IsSingleProcess() {
   return true;
 }
 
 }  // namespace webkit_glue