Fix tests that broke during a merge. We now match upstream's

baselines, so we don't need our own.

BUG=none
TEST=layout test try server
Review URL: http://codereview.chromium.org/197032

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25554 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 2 insertions, 86 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/remove-shorthand-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/remove-shorthand-expected.txt
deleted file mode 100644
index dffe08d..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/remove-shorthand-expected.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-Test for http://bugs.webkit.org/show_bug.cgi?id=9284 Quirksmode (CSS1): Removing inline border styles is impossible.
-
-Starting with a declaration containing all properties that are constituents of shortcuts, see what is removed when a shortcut property is removed. The shortcut’s constituents and only them should be removed.
-
-Removing background removes background-image, background-repeat, background-attachment, background-origin, background-clip, background-color, background-position.
-Removing background-position removes background-position.
-Removing border removes border-top-width, border-right-width, border-bottom-width, border-left-width, border-top-style, border-right-style, border-bottom-style, border-left-style, border-top-color, border-right-color, border-bottom-color, border-left-color.
-Removing border-top removes border-top-width, border-top-style, border-top-color.
-Removing border-right removes border-right-width, border-right-style, border-right-color.
-Removing border-bottom removes border-bottom-width, border-bottom-style, border-bottom-color.
-Removing border-left removes border-left-width, border-left-style, border-left-color.
-Removing border-color removes border-top-color, border-right-color, border-bottom-color, border-left-color.
-Removing border-style removes border-top-style, border-right-style, border-bottom-style, border-left-style.
-Removing border-width removes border-top-width, border-right-width, border-bottom-width, border-left-width.
-Removing border-radius removes border-top-left-radius, border-top-right-radius, border-bottom-right-radius, border-bottom-left-radius.
-Removing -webkit-border-radius removes border-top-left-radius, border-top-right-radius, border-bottom-right-radius, border-bottom-left-radius.
-Removing border-spacing removes -webkit-border-horizontal-spacing, -webkit-border-vertical-spacing.
-Removing -webkit-columns removes -webkit-column-width, -webkit-column-count.
-Removing -webkit-column-rule removes -webkit-column-rule-width, -webkit-column-rule-style, -webkit-column-rule-color.
-Removing list-style removes list-style-type, list-style-position, list-style-image.
-Removing margin removes margin-top, margin-right, margin-bottom, margin-left.
-Removing -webkit-margin-collapse removes -webkit-margin-top-collapse, -webkit-margin-bottom-collapse.
-Removing -webkit-marquee removes -webkit-marquee-direction, -webkit-marquee-increment, -webkit-marquee-repetition, -webkit-marquee-style, -webkit-marquee-speed.
-Removing -webkit-mask removes -webkit-mask-image, -webkit-mask-repeat, -webkit-mask-attachment, -webkit-mask-position-x, -webkit-mask-position-y, -webkit-mask-origin, -webkit-mask-clip.
-Removing -webkit-mask-position removes -webkit-mask-position-x, -webkit-mask-position-y.
-Removing overflow removes overflow-x, overflow-y.
-Removing padding removes padding-top, padding-right, padding-bottom, padding-left.
-Removing -webkit-text-stroke removes -webkit-text-stroke-color, -webkit-text-stroke-width.
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inspector/style-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inspector/style-expected.txt
deleted file mode 100644
index 1152635..0000000
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inspector/style-expected.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock (anonymous) at (0,0) size 784x20
-        RenderText {#text} at (0,0) size 345x19
-          text run at (0,0) width 345: "Note that background and font are both buggy right now!"
-      RenderBlock {DIV} at (24,44) size 736x28 [color=#FFFFFF] [bgcolor=#800080]
-        RenderText {#text} at (0,0) size 41x27
-          text run at (0,0) width 41: "Test"
-      RenderBlock (anonymous) at (0,96) size 784x280
-        RenderText {#text} at (0,0) size 367x19
-          text run at (0,0) width 367: "background-image: initial (original property was background)"
-        RenderBR {BR} at (367,15) size 0x0
-        RenderText {#text} at (0,20) size 370x19
-          text run at (0,20) width 370: "background-repeat: initial (original property was background)"
-        RenderBR {BR} at (370,35) size 0x0
-        RenderText {#text} at (0,40) size 397x19
-          text run at (0,40) width 397: "background-attachment: initial (original property was background)"
-        RenderBR {BR} at (397,55) size 0x0
-        RenderText {#text} at (0,60) size 392x19
-          text run at (0,60) width 392: "background-position-x: initial (original property was background)"
-        RenderBR {BR} at (392,75) size 0x0
-        RenderText {#text} at (0,80) size 392x19
-          text run at (0,80) width 392: "background-position-y: initial (original property was background)"
-        RenderBR {BR} at (392,95) size 0x0
-        RenderText {#text} at (0,100) size 365x19
-          text run at (0,100) width 365: "background-origin: initial (original property was background)"
-        RenderBR {BR} at (365,115) size 0x0
-        RenderText {#text} at (0,120) size 353x19
-          text run at (0,120) width 353: "background-clip: initial (original property was background)"
-        RenderBR {BR} at (353,135) size 0x0
-        RenderText {#text} at (0,140) size 371x19
-          text run at (0,140) width 371: "background-color: purple (original property was background)"
-        RenderBR {BR} at (371,155) size 0x0
-        RenderText {#text} at (0,160) size 284x19
-          text run at (0,160) width 284: "margin-top: 1em (original property was margin)"
-        RenderBR {BR} at (284,175) size 0x0
-        RenderText {#text} at (0,180) size 481x19
-          text run at (0,180) width 481: "margin-right: 1em (original property was margin and property was implicitly set.)"
-        RenderBR {BR} at (481,195) size 0x0
-        RenderText {#text} at (0,200) size 498x19
-          text run at (0,200) width 498: "margin-bottom: 1em (original property was margin and property was implicitly set.)"
-        RenderBR {BR} at (498,215) size 0x0
-        RenderText {#text} at (0,220) size 473x19
-          text run at (0,220) width 473: "margin-left: 1em (original property was margin and property was implicitly set.)"
-        RenderBR {BR} at (473,235) size 0x0
-        RenderText {#text} at (0,240) size 70x19
-          text run at (0,240) width 70: "color: white"
-        RenderBR {BR} at (70,255) size 0x0
-        RenderText {#text} at (0,260) size 341x19
-          text run at (0,260) width 341: "font: normal normal normal 24px/normal 'Lucida Grande'"
-        RenderBR {BR} at (341,275) size 0x0
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 5cfd565..4143a3f 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2287,11 +2287,9 @@ BUG20748 MAC : LayoutTests/http/tests/security/frameNavigation/xss-DENIED-plugin
 BUG20748 MAC : LayoutTests/http/tests/plugins/get-url.html = TIMEOUT
 BUG20748 MAC : LayoutTests/http/tests/plugins/interrupted-get-url.html = TIMEOUT
 
-BUG_OJAN WIN LINUX : LayoutTests/fast/css/remove-shorthand.html = FAIL
-BUG_OJAN WIN LINUX : LayoutTests/fast/inspector/style.html = FAIL
-
-// Flaky crashes
+// started crashing at build 5804 then green until 5863 of webkit-dbg-2
 BUG20786 WIN DEBUG : LayoutTests/fast/dom/undetectable-style-filter.html = PASS CRASH
+// started crashing at build 5859 of webkit-dbg-2
 BUG20786 WIN DEBUG : LayoutTests/fast/dom/undetectable-document-all.html = PASS CRASH
 
 BUG10480 LINUX DEBUG : LayoutTests/editing/selection/move-by-line-001.html = PASS FAIL