Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(693)

Unified Diff: webkit/tools/test_shell/test_shell.h

Issue 2850042: Deprecate more old filepath functions. (Closed)
Patch Set: rebase Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/tools/test_shell/test_shell.h
diff --git a/webkit/tools/test_shell/test_shell.h b/webkit/tools/test_shell/test_shell.h
index 117e2d2119d10028605e6325e72b71e106fdced1..8f7e60c98bf1ff2d462deb678462a33956201d31 100644
--- a/webkit/tools/test_shell/test_shell.h
+++ b/webkit/tools/test_shell/test_shell.h
@@ -32,6 +32,7 @@
#include <list>
#include "base/basictypes.h"
+#include "base/file_path.h"
#if defined(OS_MACOSX)
#include "base/lazy_instance.h"
#endif
@@ -50,7 +51,6 @@ typedef std::list<gfx::NativeWindow> WindowList;
struct WebPreferences;
class AccessibilityController;
-class FilePath;
class GURL;
class TestNavigationEntry;
class TestNavigationController;
@@ -75,7 +75,7 @@ public:
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.
@@ -202,7 +202,7 @@ public:
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();
@@ -262,7 +262,7 @@ public:
// 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();

Powered by Google App Engine
This is Rietveld 408576698