summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordpranke@google.com <dpranke@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-15 23:16:48 +0000
committerdpranke@google.com <dpranke@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-15 23:16:48 +0000
commit1af924c1a438a37bd270d3f6d06c320732972ba4 (patch)
tree282efe66d686107a03c9718318f4de9b39b65262
parenta97d13dbe6d9f539d6f8f5d990c8a26abcb6767b (diff)
downloadchromium_src-1af924c1a438a37bd270d3f6d06c320732972ba4.zip
chromium_src-1af924c1a438a37bd270d3f6d06c320732972ba4.tar.gz
chromium_src-1af924c1a438a37bd270d3f6d06c320732972ba4.tar.bz2
test_shell had hard-coded paths to the old LayoutTests location
test_shell had a javascript function that transformed file:/// URLs to point to the top of the old LayoutTests tree (src/webkit/data/LayoutTests). I have modified it to point to the new one (src/third_party/WebKit/LayoutTests). BUG=https://crbug.com/16865 R=victorw TEST=LayoutTests/fast/loader/local-css-from-local-html.html Review URL: http://codereview.chromium.org/149713 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20805 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/tools/test_shell/test_shell_win.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc
index 896cdaf..9d6cefc 100644
--- a/webkit/tools/test_shell/test_shell_win.cc
+++ b/webkit/tools/test_shell/test_shell_win.cc
@@ -287,9 +287,8 @@ std::string TestShell::RewriteLocalUrl(const std::string& url) {
PathService::Get(base::DIR_EXE, &replace_url);
file_util::UpOneDirectory(&replace_url);
file_util::UpOneDirectory(&replace_url);
- file_util::AppendToPath(&replace_url, L"webkit");
- file_util::AppendToPath(&replace_url, L"data");
- file_util::AppendToPath(&replace_url, L"layout_tests");
+ file_util::AppendToPath(&replace_url, L"third_party");
+ file_util::AppendToPath(&replace_url, L"WebKit");
file_util::AppendToPath(&replace_url, L"LayoutTests");
replace_url.push_back(FilePath::kSeparators[0]);
new_url = std::string("file:///") +