summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-21 11:39:18 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-21 11:39:18 +0000
commit2bf88154b042ae1662dd8c05e2ba130e851c6bcf (patch)
treed2b12ed71c4165f5b1b1a07ed626504c4c31db22 /webkit/tools
parentdd988fa42a1eb46a320ab9e31b4ad242d1386968 (diff)
downloadchromium_src-2bf88154b042ae1662dd8c05e2ba130e851c6bcf.zip
chromium_src-2bf88154b042ae1662dd8c05e2ba130e851c6bcf.tar.gz
chromium_src-2bf88154b042ae1662dd8c05e2ba130e851c6bcf.tar.bz2
Re-roll to WebKit r146382 now that the failing test has been disabled on the Chrome side.
Also remove some seemingly-outdated Chrome-side expectation overrides. BUG=222584 TEST=none TBR=antonm Review URL: https://chromiumcodereview.appspot.com/12442010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189563 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt4
1 files changed, 0 insertions, 4 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 83f98fe..dc5ee63 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -31,7 +31,3 @@
# Right?)
#
# EVERYTHING BELOW THIS LINE WILL BE DELETED AT EVERY WEBKIT DEPS ROLL
-
-webkit.org/b/110887 fast/dom/Window/window-custom-prototype.html [ Failure ]
-webkit.org/b/110887 fast/js/JSON-parse.html [ Failure ]
-webkit.org/b/110887 fast/js/cyclic-prototypes.html [ Failure ]