From f7b8b9f697e41f44319ac7b757c9442d07f73b0c Mon Sep 17 00:00:00 2001 From: "mihaip@chromium.org" Date: Tue, 1 Feb 2011 18:07:32 +0000 Subject: Update GetWebKitRootDirFilePath to handle the move of WebKit/ into Source/. BUG=none TEST=layout tests Review URL: http://codereview.chromium.org/6334024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73306 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/support/webkit_support.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'webkit/support') diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index 195257b..2e893f9 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -164,8 +164,8 @@ FilePath GetWebKitRootDirFilePath() { if (file_util::PathExists(basePath.Append(FILE_PATH_LITERAL("chrome")))) { return basePath.Append(FILE_PATH_LITERAL("third_party/WebKit")); } else { - // WebKit/WebKit/chromium/ -> WebKit/ - return basePath.Append(FILE_PATH_LITERAL("../..")); + // WebKit/Source/WebKit/chromium/ -> WebKit/ + return basePath.Append(FILE_PATH_LITERAL("../../..")); } } @@ -409,7 +409,8 @@ WebURL RewriteLayoutTestsURL(const std::string& utf8_url) { FilePath replacePath = GetWebKitRootDirFilePath().Append(FILE_PATH_LITERAL("LayoutTests/")); - CHECK(file_util::PathExists(replacePath)); + CHECK(file_util::PathExists(replacePath)) << replacePath.value() << + " (re-written from " << utf8_url << ") does not exit"; #if defined(OS_WIN) std::string utf8_path = WideToUTF8(replacePath.value()); #else -- cgit v1.1