Ensure we never remove the style attribute when syncing it from CSSOM.

third_party/WebKit/LayoutTests/platform/mac/external/wpt/editing/run/underline-expected.txt

Index: third_party/WebKit/LayoutTests/platform/mac/external/wpt/editing/run/underline-expected.txt
diff --git a/third_party/WebKit/LayoutTests/platform/mac/external/wpt/editing/run/underline-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/external/wpt/editing/run/underline-expected.txt
index bd762fa03268f66afce1a2d59d5c8f7cb9e1015b..809684efca82c58dd192f53a1746fcea51f98fec 100644
--- a/third_party/WebKit/LayoutTests/platform/mac/external/wpt/editing/run/underline-expected.txt
+++ b/third_party/WebKit/LayoutTests/platform/mac/external/wpt/editing/run/underline-expected.txt
@@ -1,5 +1,5 @@
 This is a testharness.js-based test.
-Found 2123 tests; 1748 PASS, 375 FAIL, 0 TIMEOUT, 0 NOTRUN.
+Found 2123 tests; 1747 PASS, 376 FAIL, 0 TIMEOUT, 0 NOTRUN.
 PASS [["underline",""]] "foo[]bar": execCommand("underline", false, "") return value 
 PASS [["underline",""]] "foo[]bar" checks for modifications to non-editable content 
 PASS [["underline",""]] "foo[]bar" compare innerHTML 
@@ -656,7 +656,7 @@ FAIL [["stylewithcss","false"],["underline",""]] "<u>foo[b<span style=\"font-siz
 PASS [["stylewithcss","true"],["underline",""]] "<u>foo[b<i>ar]ba</i>z</u>": execCommand("stylewithcss", false, "true") return value 
 PASS [["stylewithcss","true"],["underline",""]] "<u>foo[b<i>ar]ba</i>z</u>": execCommand("underline", false, "") return value 
 PASS [["stylewithcss","true"],["underline",""]] "<u>foo[b<i>ar]ba</i>z</u>" checks for modifications to non-editable content 
-FAIL [["stylewithcss","true"],["underline",""]] "<u>foo[b<i>ar]ba</i>z</u>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<span style=\"text-decoration:underline\">foo</span>b<i>ar<span style=\"text-decoration:underline\">ba</span></i><span style=\"text-decoration:underline\">z</span>" but got "<u>foo</u>b<i>ar<span style=\"text-decoration-line:underline\">ba</span></i><span style=\"text-decoration-line:underline\">z</span>"
+FAIL [["stylewithcss","true"],["underline",""]] "<u>foo[b<i>ar]ba</i>z</u>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<span style=\"text-decoration:underline\">foo</span>b<i>ar<span style=\"text-decoration:underline\">ba</span></i><span style=\"text-decoration:underline\">z</span>" but got "<u>foo</u>b<i style=\"\">ar<span style=\"text-decoration-line:underline\">ba</span></i><span style=\"text-decoration-line:underline\">z</span>"
 PASS [["stylewithcss","true"],["underline",""]] "<u>foo[b<i>ar]ba</i>z</u>" queryCommandIndeterm("stylewithcss") before 
 PASS [["stylewithcss","true"],["underline",""]] "<u>foo[b<i>ar]ba</i>z</u>" queryCommandState("stylewithcss") before 
 PASS [["stylewithcss","true"],["underline",""]] "<u>foo[b<i>ar]ba</i>z</u>" queryCommandValue("stylewithcss") before 
@@ -672,7 +672,7 @@ FAIL [["stylewithcss","true"],["underline",""]] "<u>foo[b<i>ar]ba</i>z</u>" quer
 PASS [["stylewithcss","false"],["underline",""]] "<u>foo[b<i>ar]ba</i>z</u>": execCommand("stylewithcss", false, "false") return value 
 PASS [["stylewithcss","false"],["underline",""]] "<u>foo[b<i>ar]ba</i>z</u>": execCommand("underline", false, "") return value 
 PASS [["stylewithcss","false"],["underline",""]] "<u>foo[b<i>ar]ba</i>z</u>" checks for modifications to non-editable content 
-PASS [["stylewithcss","false"],["underline",""]] "<u>foo[b<i>ar]ba</i>z</u>" compare innerHTML 
+FAIL [["stylewithcss","false"],["underline",""]] "<u>foo[b<i>ar]ba</i>z</u>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<u>foo</u>b<i>ar<u>ba</u></i><u>z</u>" but got "<u>foo</u>b<i style=\"\">ar<u>ba</u></i><u>z</u>"
 PASS [["stylewithcss","false"],["underline",""]] "<u>foo[b<i>ar]ba</i>z</u>" queryCommandIndeterm("stylewithcss") before 
 PASS [["stylewithcss","false"],["underline",""]] "<u>foo[b<i>ar]ba</i>z</u>" queryCommandState("stylewithcss") before 
 PASS [["stylewithcss","false"],["underline",""]] "<u>foo[b<i>ar]ba</i>z</u>" queryCommandValue("stylewithcss") before 
@@ -688,7 +688,7 @@ FAIL [["stylewithcss","false"],["underline",""]] "<u>foo[b<i>ar]ba</i>z</u>" que
 PASS [["stylewithcss","true"],["underline",""]] "<p style=\"text-decoration: underline\">foo[bar]baz</p>": execCommand("stylewithcss", false, "true") return value 
 PASS [["stylewithcss","true"],["underline",""]] "<p style=\"text-decoration: underline\">foo[bar]baz</p>": execCommand("underline", false, "") return value 
 PASS [["stylewithcss","true"],["underline",""]] "<p style=\"text-decoration: underline\">foo[bar]baz</p>" checks for modifications to non-editable content 
-FAIL [["stylewithcss","true"],["underline",""]] "<p style=\"text-decoration: underline\">foo[bar]baz</p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p><span style=\"text-decoration:underline\">foo</span>bar<span style=\"text-decoration:underline\">baz</span></p>" but got "<p><span style=\"text-decoration-line:underline\">foo</span>bar<span style=\"text-decoration-line:underline\">baz</span></p>"
+FAIL [["stylewithcss","true"],["underline",""]] "<p style=\"text-decoration: underline\">foo[bar]baz</p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p><span style=\"text-decoration:underline\">foo</span>bar<span style=\"text-decoration:underline\">baz</span></p>" but got "<p style=\"\"><span style=\"text-decoration-line:underline\">foo</span>bar<span style=\"text-decoration-line:underline\">baz</span></p>"
 PASS [["stylewithcss","true"],["underline",""]] "<p style=\"text-decoration: underline\">foo[bar]baz</p>" queryCommandIndeterm("stylewithcss") before 
 PASS [["stylewithcss","true"],["underline",""]] "<p style=\"text-decoration: underline\">foo[bar]baz</p>" queryCommandState("stylewithcss") before 
 PASS [["stylewithcss","true"],["underline",""]] "<p style=\"text-decoration: underline\">foo[bar]baz</p>" queryCommandValue("stylewithcss") before 
@@ -704,7 +704,7 @@ FAIL [["stylewithcss","true"],["underline",""]] "<p style=\"text-decoration: und
 PASS [["stylewithcss","false"],["underline",""]] "<p style=\"text-decoration: underline\">foo[bar]baz</p>": execCommand("stylewithcss", false, "false") return value 
 PASS [["stylewithcss","false"],["underline",""]] "<p style=\"text-decoration: underline\">foo[bar]baz</p>": execCommand("underline", false, "") return value 
 PASS [["stylewithcss","false"],["underline",""]] "<p style=\"text-decoration: underline\">foo[bar]baz</p>" checks for modifications to non-editable content 
-FAIL [["stylewithcss","false"],["underline",""]] "<p style=\"text-decoration: underline\">foo[bar]baz</p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p><u>foo</u>bar<u>baz</u></p>" but got "<p><span style=\"text-decoration-line:underline\">foo</span>bar<u>baz</u></p>"
+FAIL [["stylewithcss","false"],["underline",""]] "<p style=\"text-decoration: underline\">foo[bar]baz</p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p><u>foo</u>bar<u>baz</u></p>" but got "<p style=\"\"><span style=\"text-decoration-line:underline\">foo</span>bar<u>baz</u></p>"
 PASS [["stylewithcss","false"],["underline",""]] "<p style=\"text-decoration: underline\">foo[bar]baz</p>" queryCommandIndeterm("stylewithcss") before 
 PASS [["stylewithcss","false"],["underline",""]] "<p style=\"text-decoration: underline\">foo[bar]baz</p>" queryCommandState("stylewithcss") before 
 PASS [["stylewithcss","false"],["underline",""]] "<p style=\"text-decoration: underline\">foo[bar]baz</p>" queryCommandValue("stylewithcss") before 
@@ -944,7 +944,7 @@ FAIL [["stylewithcss","false"],["underline",""]] "<s>foo[b<i>ar]ba</i>z</s>" que
 PASS [["stylewithcss","true"],["underline",""]] "<p style=\"text-decoration: line-through\">foo[bar]baz</p>": execCommand("stylewithcss", false, "true") return value 
 PASS [["stylewithcss","true"],["underline",""]] "<p style=\"text-decoration: line-through\">foo[bar]baz</p>": execCommand("underline", false, "") return value 
 PASS [["stylewithcss","true"],["underline",""]] "<p style=\"text-decoration: line-through\">foo[bar]baz</p>" checks for modifications to non-editable content 
-FAIL [["stylewithcss","true"],["underline",""]] "<p style=\"text-decoration: line-through\">foo[bar]baz</p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p style=\"text-decoration:line-through\">foo<span style=\"text-decoration:underline\">bar</span>baz</p>" but got "<p><span style=\"text-decoration-line:line-through\">foo</span><span style=\"text-decoration-line:line-through underline\">bar</span><span style=\"text-decoration-line:line-through\">baz</span></p>"
+FAIL [["stylewithcss","true"],["underline",""]] "<p style=\"text-decoration: line-through\">foo[bar]baz</p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p style=\"text-decoration:line-through\">foo<span style=\"text-decoration:underline\">bar</span>baz</p>" but got "<p style=\"\"><span style=\"text-decoration-line:line-through\">foo</span><span style=\"text-decoration-line:line-through underline\">bar</span><span style=\"text-decoration-line:line-through\">baz</span></p>"
 PASS [["stylewithcss","true"],["underline",""]] "<p style=\"text-decoration: line-through\">foo[bar]baz</p>" queryCommandIndeterm("stylewithcss") before 
 PASS [["stylewithcss","true"],["underline",""]] "<p style=\"text-decoration: line-through\">foo[bar]baz</p>" queryCommandState("stylewithcss") before 
 PASS [["stylewithcss","true"],["underline",""]] "<p style=\"text-decoration: line-through\">foo[bar]baz</p>" queryCommandValue("stylewithcss") before 
@@ -960,7 +960,7 @@ FAIL [["stylewithcss","true"],["underline",""]] "<p style=\"text-decoration: lin
 PASS [["stylewithcss","false"],["underline",""]] "<p style=\"text-decoration: line-through\">foo[bar]baz</p>": execCommand("stylewithcss", false, "false") return value 
 PASS [["stylewithcss","false"],["underline",""]] "<p style=\"text-decoration: line-through\">foo[bar]baz</p>": execCommand("underline", false, "") return value 
 PASS [["stylewithcss","false"],["underline",""]] "<p style=\"text-decoration: line-through\">foo[bar]baz</p>" checks for modifications to non-editable content 
-FAIL [["stylewithcss","false"],["underline",""]] "<p style=\"text-decoration: line-through\">foo[bar]baz</p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p style=\"text-decoration:line-through\">foo<u>bar</u>baz</p>" but got "<p><span style=\"text-decoration-line:line-through\">foo</span><u><strike>bar</strike></u><strike>baz</strike></p>"
+FAIL [["stylewithcss","false"],["underline",""]] "<p style=\"text-decoration: line-through\">foo[bar]baz</p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p style=\"text-decoration:line-through\">foo<u>bar</u>baz</p>" but got "<p style=\"\"><span style=\"text-decoration-line:line-through\">foo</span><u><strike>bar</strike></u><strike>baz</strike></p>"
 PASS [["stylewithcss","false"],["underline",""]] "<p style=\"text-decoration: line-through\">foo[bar]baz</p>" queryCommandIndeterm("stylewithcss") before 
 PASS [["stylewithcss","false"],["underline",""]] "<p style=\"text-decoration: line-through\">foo[bar]baz</p>" queryCommandState("stylewithcss") before 
 PASS [["stylewithcss","false"],["underline",""]] "<p style=\"text-decoration: line-through\">foo[bar]baz</p>" queryCommandValue("stylewithcss") before 
@@ -1711,7 +1711,7 @@ FAIL [["stylewithcss","false"],["underline",""]] "foo<u style=\"text-decoration:
 PASS [["stylewithcss","true"],["underline",""]] "<p style=\"text-decoration: overline\">foo[bar]baz</p>": execCommand("stylewithcss", false, "true") return value 
 PASS [["stylewithcss","true"],["underline",""]] "<p style=\"text-decoration: overline\">foo[bar]baz</p>": execCommand("underline", false, "") return value 
 PASS [["stylewithcss","true"],["underline",""]] "<p style=\"text-decoration: overline\">foo[bar]baz</p>" checks for modifications to non-editable content 
-FAIL [["stylewithcss","true"],["underline",""]] "<p style=\"text-decoration: overline\">foo[bar]baz</p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p style=\"text-decoration:overline\">foo<span style=\"text-decoration:underline\">bar</span>baz</p>" but got "<p><span style=\"text-decoration-line:overline\">foo</span><span style=\"text-decoration-line:overline underline\">bar</span><span style=\"text-decoration-line:overline\">baz</span></p>"
+FAIL [["stylewithcss","true"],["underline",""]] "<p style=\"text-decoration: overline\">foo[bar]baz</p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p style=\"text-decoration:overline\">foo<span style=\"text-decoration:underline\">bar</span>baz</p>" but got "<p style=\"\"><span style=\"text-decoration-line:overline\">foo</span><span style=\"text-decoration-line:overline underline\">bar</span><span style=\"text-decoration-line:overline\">baz</span></p>"
 PASS [["stylewithcss","true"],["underline",""]] "<p style=\"text-decoration: overline\">foo[bar]baz</p>" queryCommandIndeterm("stylewithcss") before 
 PASS [["stylewithcss","true"],["underline",""]] "<p style=\"text-decoration: overline\">foo[bar]baz</p>" queryCommandState("stylewithcss") before 
 PASS [["stylewithcss","true"],["underline",""]] "<p style=\"text-decoration: overline\">foo[bar]baz</p>" queryCommandValue("stylewithcss") before 
@@ -1727,7 +1727,7 @@ FAIL [["stylewithcss","true"],["underline",""]] "<p style=\"text-decoration: ove
 PASS [["stylewithcss","false"],["underline",""]] "<p style=\"text-decoration: overline\">foo[bar]baz</p>": execCommand("stylewithcss", false, "false") return value 
 PASS [["stylewithcss","false"],["underline",""]] "<p style=\"text-decoration: overline\">foo[bar]baz</p>": execCommand("underline", false, "") return value 
 PASS [["stylewithcss","false"],["underline",""]] "<p style=\"text-decoration: overline\">foo[bar]baz</p>" checks for modifications to non-editable content 
-FAIL [["stylewithcss","false"],["underline",""]] "<p style=\"text-decoration: overline\">foo[bar]baz</p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p style=\"text-decoration:overline\">foo<u>bar</u>baz</p>" but got "<p><span style=\"text-decoration-line:overline\">foo<u>bar</u>baz</span></p>"
+FAIL [["stylewithcss","false"],["underline",""]] "<p style=\"text-decoration: overline\">foo[bar]baz</p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p style=\"text-decoration:overline\">foo<u>bar</u>baz</p>" but got "<p style=\"\"><span style=\"text-decoration-line:overline\">foo<u>bar</u>baz</span></p>"
 PASS [["stylewithcss","false"],["underline",""]] "<p style=\"text-decoration: overline\">foo[bar]baz</p>" queryCommandIndeterm("stylewithcss") before 
 PASS [["stylewithcss","false"],["underline",""]] "<p style=\"text-decoration: overline\">foo[bar]baz</p>" queryCommandState("stylewithcss") before 
 PASS [["stylewithcss","false"],["underline",""]] "<p style=\"text-decoration: overline\">foo[bar]baz</p>" queryCommandValue("stylewithcss") before