diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-05 20:39:06 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-05 20:39:06 +0000 |
| commit | 2fa4f8d4a0cb58d3e9c518d3c90a4e36479a6ff3 (patch) | |
| tree | 1a442de3219dc2ddd467e5ccd2e96951097a84c9 | |
| parent | fc0a5b24f4bb91d5692f58d97f8c224ceb6bdfcd (diff) | |
| download | chromium_src-2fa4f8d4a0cb58d3e9c518d3c90a4e36479a6ff3.zip chromium_src-2fa4f8d4a0cb58d3e9c518d3c90a4e36479a6ff3.tar.gz chromium_src-2fa4f8d4a0cb58d3e9c518d3c90a4e36479a6ff3.tar.bz2 | |
Revert 40768 - Flip the ui_tests framework to use the upstream http_server start code
BUG=23099
R=dglazkov@chromium.org, maruel@chromium.org
TEST=unit_tests passes
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=40603
Review URL: http://codereview.chromium.org/660416
TBR=dpranke@chromium.org
Review URL: http://codereview.chromium.org/669191
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40770 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/ui/ui_test.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index 6a52780..08ed51e 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -287,13 +287,12 @@ static CommandLine* CreateHttpServerCommandLine() { PathService::Get(base::DIR_SOURCE_ROOT, &src_path); FilePath script_path(src_path); - script_path = script_path.AppendASCII("third_party"); - script_path = script_path.AppendASCII("WebKit"); - script_path = script_path.AppendASCII("WebKitTools"); - script_path = script_path.AppendASCII("Scripts"); + script_path = script_path.AppendASCII("webkit"); + script_path = script_path.AppendASCII("tools"); + script_path = script_path.AppendASCII("layout_tests"); script_path = script_path.AppendASCII("webkitpy"); script_path = script_path.AppendASCII("layout_tests"); - script_path = script_path.AppendASCII("port"); + script_path = script_path.AppendASCII("layout_package"); script_path = script_path.AppendASCII("http_server.py"); CommandLine* cmd_line = CreatePythonCommandLine(); |