Deprecate more old filepath functions.

webkit/tools/test_shell/test_shell.h

 /*
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 14 matching lines @@
 
 #ifndef WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_H_
 #define WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_H_
 
 #pragma once
 
 #include <string>
 #include <list>
 
 #include "base/basictypes.h"
+#include "base/file_path.h"
 #if defined(OS_MACOSX)
 #include "base/lazy_instance.h"
 #endif
 #include "base/ref_counted.h"
 #include "base/weak_ptr.h"
 #include "gfx/native_widget_types.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebNavigationPolicy.h"
 #include "webkit/tools/test_shell/event_sending_controller.h"
 #include "webkit/tools/test_shell/layout_test_controller.h"
 #include "webkit/tools/test_shell/plain_text_controller.h"
 #include "webkit/tools/test_shell/text_input_controller.h"
 #include "webkit/tools/test_shell/webview_host.h"
 #include "webkit/tools/test_shell/webwidget_host.h"
 
 typedef std::list<gfx::NativeWindow> WindowList;
 
 struct WebPreferences;
 class AccessibilityController;
-class FilePath;
 class GURL;
 class TestNavigationEntry;
 class TestNavigationController;
 class TestNotificationPresenter;
 class TestShellDevToolsAgent;
 class TestShellDevToolsClient;
 class TestWebViewDelegate;
 
 namespace base {
 class StringPiece;
 }
 
 class TestShell : public base::SupportsWeakPtr<TestShell>  {
 public:
     struct TestParams {
       // Load the test defaults.
       TestParams() : dump_tree(true), dump_pixels(false) {
       }
 
       // The kind of output we want from this test.
       bool dump_tree;
       bool dump_pixels;
 
       // Filename we dump pixels to (when pixel testing is enabled).
-      std::wstring pixel_file_name;
+      FilePath pixel_file_name;
       // The md5 hash of the bitmap dump (when pixel testing is enabled).
       std::string pixel_hash;
       // URL of the test.
       std::string test_url;
     };
 
     TestShell();
     virtual ~TestShell();
 
     // Initialization and clean up of logging.
@@ skipping 106 matching lines @@
       return layout_test_controller_->AcceptsEditing();
     }
 
     void LoadFile(const FilePath& file);
     void LoadURL(const GURL& url);
     void LoadURLForFrame(const GURL& url, const std::wstring& frame_name);
     void GoBackOrForward(int offset);
     void Reload();
     bool Navigate(const TestNavigationEntry& entry, bool reload);
 
-    bool PromptForSaveFile(const wchar_t* prompt_title, std::wstring* result);
+    bool PromptForSaveFile(const wchar_t* prompt_title, FilePath* result);
     std::wstring GetDocumentText();
     void DumpDocumentText();
     void DumpRenderTree();
 
     gfx::NativeWindow mainWnd() const { return m_mainWnd; }
     gfx::NativeView webViewWnd() const { return m_webViewHost->view_handle(); }
     gfx::NativeEditView editWnd() const { return m_editWnd; }
     gfx::NativeView popupWnd() const { return m_popupHost->view_handle(); }
 
     static WindowList* windowList() { return window_list_; }
@@ skipping 39 matching lines @@
     // Writes the back-forward list data for this test shell into result.
     void DumpBackForwardList(std::wstring* result);
 
     // Dumps the output from given test as text and/or image depending on
     // the flags set.
     static void Dump(TestShell* shell);
 
     // Writes the image captured from the given web frame to the given file.
     // The returned string is the ASCII-ized MD5 sum of the image.
     static std::string DumpImage(skia::PlatformCanvas* canvas,
-                                 const std::wstring& file_name,
+                                 const FilePath& path,
                                  const std::string& pixel_hash);
 
     static void ResetWebPreferences();
 
     static void SetAllowScriptsToCloseWindows();
 
     WebPreferences* GetWebPreferences() { return web_prefs_; }
 
     // Some layout tests hardcode a file:///tmp/LayoutTests URL.  We get around
     // this by substituting "tmp" with the path to the LayoutTests parent dir.
@@ skipping 160 matching lines @@
 #if defined(OS_WIN)
     // Used by the watchdog to know when it's finished.
     HANDLE finished_event_;
 #endif
 
     // Dump the stats table counters on exit.
     bool dump_stats_table_on_exit_;
 };
 
 #endif  // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_H_