| Index: webkit/tools/test_shell/test_shell_main.cc
|
| diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc
|
| index 5bebaad72c1770e8f42fd1c140cede93dc9a30ed..5c98d985a9e4a8123f0e3f3e51b06d4b358e22d8 100644
|
| --- a/webkit/tools/test_shell/test_shell_main.cc
|
| +++ b/webkit/tools/test_shell/test_shell_main.cc
|
| @@ -160,7 +160,7 @@ int main(int argc, char* argv[]) {
|
| if (parsed_command_line.HasSwitch(test_shell::kEnableFileCookies))
|
| net::CookieMonster::EnableFileScheme();
|
|
|
| - FilePath cache_path =
|
| + base::FilePath cache_path =
|
| parsed_command_line.GetSwitchValuePath(test_shell::kCacheDir);
|
| if (cache_path.empty()) {
|
| PathService::Get(base::DIR_EXE, &cache_path);
|
| @@ -214,7 +214,7 @@ int main(int argc, char* argv[]) {
|
| // Treat the first argument as the initial URL to open.
|
| GURL starting_url;
|
|
|
| - FilePath path;
|
| + base::FilePath path;
|
| PathService::Get(base::DIR_SOURCE_ROOT, &path);
|
| path = path.AppendASCII("webkit").AppendASCII("data")
|
| .AppendASCII("test_shell").AppendASCII("index.html");
|
| @@ -227,7 +227,7 @@ int main(int argc, char* argv[]) {
|
| starting_url = url;
|
| } else {
|
| // Treat as a relative file path.
|
| - FilePath path = FilePath(args[0]);
|
| + base::FilePath path = base::FilePath(args[0]);
|
| file_util::AbsolutePath(&path);
|
| starting_url = net::FilePathToFileURL(path);
|
| }
|
|
|