| Index: content/test/layout_test_http_server.cc
|
| diff --git a/content/test/layout_test_http_server.cc b/content/test/layout_test_http_server.cc
|
| index 603a47940e4643ece42e8cdb665b1e356b622f31..23c972a4bc15e3efc1f9c6259be352eca422567b 100644
|
| --- a/content/test/layout_test_http_server.cc
|
| +++ b/content/test/layout_test_http_server.cc
|
| @@ -20,14 +20,14 @@ namespace content {
|
| namespace {
|
|
|
| bool PrepareCommandLine(CommandLine* cmd_line) {
|
| - FilePath src_path;
|
| + base::FilePath src_path;
|
| if (!PathService::Get(base::DIR_SOURCE_ROOT, &src_path))
|
| return false;
|
|
|
| if (!GetPythonCommand(cmd_line))
|
| return false;
|
|
|
| - FilePath script_path(src_path);
|
| + base::FilePath script_path(src_path);
|
| script_path = script_path.AppendASCII("third_party");
|
| script_path = script_path.AppendASCII("WebKit");
|
| script_path = script_path.AppendASCII("Tools");
|
| @@ -40,7 +40,7 @@ bool PrepareCommandLine(CommandLine* cmd_line) {
|
|
|
| } // namespace
|
|
|
| -LayoutTestHttpServer::LayoutTestHttpServer(const FilePath& root_directory,
|
| +LayoutTestHttpServer::LayoutTestHttpServer(const base::FilePath& root_directory,
|
| int port)
|
| : root_directory_(root_directory),
|
| port_(port),
|
| @@ -67,7 +67,7 @@ bool LayoutTestHttpServer::Start() {
|
| root_directory_.value());
|
| cmd_line.AppendArg("--port=" + base::IntToString(port_));
|
|
|
| - FilePath layout_tests_dir;
|
| + base::FilePath layout_tests_dir;
|
| if (!PathService::Get(DIR_LAYOUT_TESTS, &layout_tests_dir))
|
| return false;
|
| cmd_line.AppendArgNative(FILE_PATH_LITERAL("--layout_tests_dir=") +
|
|
|