| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/test/layout_test_http_server.h" | 5 #include "content/test/layout_test_http_server.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
| 10 #include "base/process_util.h" | 10 #include "base/process_util.h" |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 return false; | 25 return false; |
| 26 | 26 |
| 27 if (!GetPythonCommand(cmd_line)) | 27 if (!GetPythonCommand(cmd_line)) |
| 28 return false; | 28 return false; |
| 29 | 29 |
| 30 base::FilePath script_path(src_path); | 30 base::FilePath script_path(src_path); |
| 31 script_path = script_path.AppendASCII("third_party"); | 31 script_path = script_path.AppendASCII("third_party"); |
| 32 script_path = script_path.AppendASCII("WebKit"); | 32 script_path = script_path.AppendASCII("WebKit"); |
| 33 script_path = script_path.AppendASCII("Tools"); | 33 script_path = script_path.AppendASCII("Tools"); |
| 34 script_path = script_path.AppendASCII("Scripts"); | 34 script_path = script_path.AppendASCII("Scripts"); |
| 35 script_path = script_path.AppendASCII("new-run-webkit-httpd"); | 35 script_path = script_path.AppendASCII("run-blink-httpd"); |
| 36 | 36 |
| 37 cmd_line->AppendArgPath(script_path); | 37 cmd_line->AppendArgPath(script_path); |
| 38 return true; | 38 return true; |
| 39 } | 39 } |
| 40 | 40 |
| 41 } // namespace | 41 } // namespace |
| 42 | 42 |
| 43 LayoutTestHttpServer::LayoutTestHttpServer(const base::FilePath& root_directory, | 43 LayoutTestHttpServer::LayoutTestHttpServer(const base::FilePath& root_directory, |
| 44 int port) | 44 int port) |
| 45 : root_directory_(root_directory), | 45 : root_directory_(root_directory), |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 #if defined(OS_WIN) | 126 #if defined(OS_WIN) |
| 127 // Close the job object handle now. This should clean up | 127 // Close the job object handle now. This should clean up |
| 128 // any orphaned processes. | 128 // any orphaned processes. |
| 129 job_handle_.Close(); | 129 job_handle_.Close(); |
| 130 #endif | 130 #endif |
| 131 | 131 |
| 132 return stopped; | 132 return stopped; |
| 133 } | 133 } |
| 134 | 134 |
| 135 } // namespace content | 135 } // namespace content |
| OLD | NEW |