summaryrefslogtreecommitdiffstats
path: root/chrome/test/ui/ui_test.cc
diff options
context:
space:
mode:
authordpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-05 20:19:12 +0000
committerdpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-05 20:19:12 +0000
commit1ea435bc2ae1b1e613bff3e044b515f3ede53245 (patch)
tree0ca1673c03786b2703d6748c2f4560e375b10b5b /chrome/test/ui/ui_test.cc
parent464b0dd4cd94623495c88cd1d879e9c7be45be9f (diff)
downloadchromium_src-1ea435bc2ae1b1e613bff3e044b515f3ede53245.zip
chromium_src-1ea435bc2ae1b1e613bff3e044b515f3ede53245.tar.gz
chromium_src-1ea435bc2ae1b1e613bff3e044b515f3ede53245.tar.bz2
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40768 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui/ui_test.cc')
-rw-r--r--chrome/test/ui/ui_test.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 08ed51e..6a52780 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -287,12 +287,13 @@ static CommandLine* CreateHttpServerCommandLine() {
PathService::Get(base::DIR_SOURCE_ROOT, &src_path);
FilePath script_path(src_path);
- script_path = script_path.AppendASCII("webkit");
- script_path = script_path.AppendASCII("tools");
- script_path = script_path.AppendASCII("layout_tests");
+ 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("webkitpy");
script_path = script_path.AppendASCII("layout_tests");
- script_path = script_path.AppendASCII("layout_package");
+ script_path = script_path.AppendASCII("port");
script_path = script_path.AppendASCII("http_server.py");
CommandLine* cmd_line = CreatePythonCommandLine();