Index: content/shell/shell_browser_main.cc |
diff --git a/content/shell/shell_browser_main.cc b/content/shell/shell_browser_main.cc |
index 9256cb350fad36bc3b1f54f6ce47ee806bee3678..cffd46421c29c682973ddd7b9b584eaeb77a4fd7 100644 |
--- a/content/shell/shell_browser_main.cc |
+++ b/content/shell/shell_browser_main.cc |
@@ -25,7 +25,7 @@ |
namespace { |
GURL GetURLForLayoutTest(const std::string& test_name, |
- FilePath* current_working_directory, |
+ base::FilePath* current_working_directory, |
bool* enable_pixel_dumping, |
std::string* expected_pixel_hash) { |
// A test name is formated like file:///path/to/test'--pixel-test'pixelhash |
@@ -55,14 +55,14 @@ GURL GetURLForLayoutTest(const std::string& test_name, |
#if defined(OS_WIN) |
std::wstring wide_path_or_url = |
base::SysNativeMBToWide(path_or_url); |
- FilePath local_file(wide_path_or_url); |
+ base::FilePath local_file(wide_path_or_url); |
#else |
- FilePath local_file(path_or_url); |
+ base::FilePath local_file(path_or_url); |
#endif |
file_util::AbsolutePath(&local_file); |
test_url = net::FilePathToFileURL(local_file); |
} |
- FilePath local_path; |
+ base::FilePath local_path; |
if (current_working_directory) { |
// We're outside of the message loop here, and this is a test. |
base::ThreadRestrictions::ScopedAllowIO allow_io; |
@@ -142,7 +142,7 @@ int ShellBrowserMain(const content::MainFunctionParams& parameters) { |
bool enable_pixel_dumps; |
std::string pixel_hash; |
- FilePath cwd; |
+ base::FilePath cwd; |
GURL test_url = GetURLForLayoutTest( |
test_string, &cwd, &enable_pixel_dumps, &pixel_hash); |
if (!content::WebKitTestController::Get()->PrepareForLayoutTest( |