Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2226)

Unified Diff: content/shell/renderer/layout_test/blink_test_runner.cc

Issue 2090033003: Remove special cases for WPT path rewriting (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Undo W3CTestExpectations Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/renderer/layout_test/blink_test_runner.cc
diff --git a/content/shell/renderer/layout_test/blink_test_runner.cc b/content/shell/renderer/layout_test/blink_test_runner.cc
index 8da725f154d1e97c45134fb72e5e82ad6d0530d9..9329244f9d9bbcbcea15efda8be95389c5bd48aa 100644
--- a/content/shell/renderer/layout_test/blink_test_runner.cc
+++ b/content/shell/renderer/layout_test/blink_test_runner.cc
@@ -234,27 +234,12 @@ WebURL RewriteAbsolutePathInWPT(const std::string& utf8_url) {
#else
std::string path = utf8_url.substr(kFileSchemeLen);
#endif
- // LayoutTests use file: URLs in various ways.
- // - The magic URL prefix "file:///tmp/LayoutTests/" to access file:
- // resources from http resources.
- // - $TMP to download a blob URL
- // - out/$CONFIG/gen/ and third_party/WebKit/Source/devtools to load
- // DevTools code.
- // We rewite only a few patterns used in web-platform-tests to avoid to
- // rewrite non-WPT URLs. We can remove this hack if we run all WPT tests
- // with wptserve.
- if (base::StartsWith(path, "common/", base::CompareCase::SENSITIVE) ||
- base::StartsWith(path, "images/", base::CompareCase::SENSITIVE) ||
- base::StartsWith(path, "media/", base::CompareCase::SENSITIVE) ||
- base::StartsWith(path, "resources/", base::CompareCase::SENSITIVE)) {
- base::FilePath new_path =
- LayoutTestRenderThreadObserver::GetInstance()
- ->webkit_source_dir()
- .Append(FILE_PATH_LITERAL("LayoutTests/imported/wpt/"))
- .AppendASCII(path);
- return WebURL(net::FilePathToFileURL(new_path));
- }
- return WebURL();
+ base::FilePath new_path =
+ LayoutTestRenderThreadObserver::GetInstance()
+ ->webkit_source_dir()
+ .Append(FILE_PATH_LITERAL("LayoutTests/imported/wpt/"))
+ .AppendASCII(path);
+ return WebURL(net::FilePathToFileURL(new_path));
}
} // namespace
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698