Monster FilePath patch!

webkit/tools/test_shell/test_shell_test.h

Index: webkit/tools/test_shell/test_shell_test.h
diff --git a/webkit/tools/test_shell/test_shell_test.h b/webkit/tools/test_shell/test_shell_test.h
index 2cdd7923f99150913eecb5340eaef138c7beabb3..4e6372ba255e710692b4ae77eb01f4ba96aba570 100644
--- a/webkit/tools/test_shell/test_shell_test.h
+++ b/webkit/tools/test_shell/test_shell_test.h
@@ -10,6 +10,9 @@
 #ifndef WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_TEST_H__
 #define WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_TEST_H__
 
+#include <string>
+
+#include "base/file_path.h"
 #include "webkit/glue/window_open_disposition.h"
 #include "webkit/tools/test_shell/test_shell.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -17,8 +20,8 @@
 class TestShellTest : public testing::Test {
  protected:
   // Returns the path "test_case_path/test_case".
-  std::wstring GetTestURL(std::wstring test_case_path,
-                          const std::wstring& test_case);
+  std::wstring GetTestURL(const FilePath& test_case_path,
+                          const std::string& test_case);
 
   virtual void SetUp();
   virtual void TearDown();
@@ -30,7 +33,7 @@ class TestShellTest : public testing::Test {
 
  protected:
   // Location of SOURCE_ROOT/webkit/data/
-  std::wstring data_dir_;
+  FilePath data_dir_;
 
   TestShell* test_shell_;
 };