summaryrefslogtreecommitdiffstats
path: root/webkit/glue/dom_serializer_unittest.cc
diff options
context:
space:
mode:
authoryutak@chromium.org <yutak@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-16 13:15:03 +0000
committeryutak@chromium.org <yutak@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-16 13:15:03 +0000
commit1465629b6c48be6d9a3301fcc5aec97e2ffc2009 (patch)
tree5103b9230f82cc07efa330342e873e780b0de3a2 /webkit/glue/dom_serializer_unittest.cc
parenta76915318c5e3d7dbeed35253627df270017f5ce (diff)
downloadchromium_src-1465629b6c48be6d9a3301fcc5aec97e2ffc2009.zip
chromium_src-1465629b6c48be6d9a3301fcc5aec97e2ffc2009.tar.gz
chromium_src-1465629b6c48be6d9a3301fcc5aec97e2ffc2009.tar.bz2
WebKit merge 65318:65411.
TBR=japhet BUG=none TEST=none Review URL: http://codereview.chromium.org/3119016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56203 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/dom_serializer_unittest.cc')
-rw-r--r--webkit/glue/dom_serializer_unittest.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/webkit/glue/dom_serializer_unittest.cc b/webkit/glue/dom_serializer_unittest.cc
index 42a6bf5..40f1cba 100644
--- a/webkit/glue/dom_serializer_unittest.cc
+++ b/webkit/glue/dom_serializer_unittest.cc
@@ -583,7 +583,8 @@ TEST_F(DomSerializerTests, SerializeHTMLDOMWithEntitiesInText) {
// Test situation of html entities in attribute value when serializing
// HTML DOM.
-TEST_F(DomSerializerTests, SerializeHTMLDOMWithEntitiesInAttributeValue) {
+// This test started to fail at WebKit r65388. See http://crbug.com/52279.
+TEST_F(DomSerializerTests, FAILS_SerializeHTMLDOMWithEntitiesInAttributeValue) {
FilePath page_file_path = data_dir_;
page_file_path = page_file_path.AppendASCII(
"dom_serializer/htmlentities_in_attribute_value.htm");
@@ -632,7 +633,8 @@ TEST_F(DomSerializerTests, SerializeHTMLDOMWithEntitiesInAttributeValue) {
}
// Test situation of non-standard HTML entities when serializing HTML DOM.
-TEST_F(DomSerializerTests, SerializeHTMLDOMWithNonStandardEntities) {
+// This test started to fail at WebKit r65351. See http://crbug.com/52279.
+TEST_F(DomSerializerTests, FAILS_SerializeHTMLDOMWithNonStandardEntities) {
// Make a test file URL and load it.
FilePath page_file_path = data_dir_;
page_file_path = page_file_path.AppendASCII("dom_serializer");