summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgrogan@chromium.org <dgrogan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-19 20:02:43 +0000
committerdgrogan@chromium.org <dgrogan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-19 20:02:43 +0000
commit9e54546bc94cce90979dd41272bbf489c36df124 (patch)
tree41fa4803c6e33fc0245e648cb266da0b3a698f33
parenta9415292f9aedca5c528532f1260118ad384aaed (diff)
downloadchromium_src-9e54546bc94cce90979dd41272bbf489c36df124.zip
chromium_src-9e54546bc94cce90979dd41272bbf489c36df124.tar.gz
chromium_src-9e54546bc94cce90979dd41272bbf489c36df124.tar.bz2
Make layout_test_http_server.cc use PathService::Get(chrome::DIR_LAYOUT_TESTS)
instead of hardcoding chrome/test/data/layout_tests/LayoutTests. The http layout tests fail on my machine (new git workflow) without this. BUG=105104 TEST= Review URL: http://codereview.chromium.org/9252038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118339 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/test/base/layout_test_http_server.cc10
1 files changed, 3 insertions, 7 deletions
diff --git a/chrome/test/base/layout_test_http_server.cc b/chrome/test/base/layout_test_http_server.cc
index b0ba02d..dd84a2b 100644
--- a/chrome/test/base/layout_test_http_server.cc
+++ b/chrome/test/base/layout_test_http_server.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -9,6 +9,7 @@
#include "base/path_service.h"
#include "base/process_util.h"
#include "base/string_number_conversions.h"
+#include "chrome/common/chrome_paths.h"
#if defined(OS_WIN)
#include "base/win/windows_version.h"
@@ -64,13 +65,8 @@ bool LayoutTestHttpServer::Start() {
cmd_line.AppendArg("--port=" + base::IntToString(port_));
FilePath layout_tests_dir;
- if (!PathService::Get(base::DIR_SOURCE_ROOT, &layout_tests_dir))
+ if (!PathService::Get(chrome::DIR_LAYOUT_TESTS, &layout_tests_dir))
return false;
- layout_tests_dir = layout_tests_dir.AppendASCII("chrome")
- .AppendASCII("test")
- .AppendASCII("data")
- .AppendASCII("layout_tests")
- .AppendASCII("LayoutTests");
cmd_line.AppendArgNative(FILE_PATH_LITERAL("--layout_tests_dir=") +
layout_tests_dir.value());