Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(56)

Side by Side Diff: content/test/layout_test_http_server.cc

Issue 14664008: Rename new-run-webkit-httpd to run-blink-httpd, chromium side. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | webkit/tools/layout_tests/run_http_server.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
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
OLDNEW
« no previous file with comments | « no previous file | webkit/tools/layout_tests/run_http_server.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698