summaryrefslogtreecommitdiffstats
path: root/webkit/glue/dom_serializer_unittest.cc
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-28 01:41:59 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-28 01:41:59 +0000
commitb4596cb08fdd4933f55a7298b95fdcae7acccfd1 (patch)
tree1a2ee4b1f3eeeea32b06ff994ed0812c9047a5c4 /webkit/glue/dom_serializer_unittest.cc
parentd747ef3e95dbcae4f31d6584c150cafd15e7feb4 (diff)
downloadchromium_src-b4596cb08fdd4933f55a7298b95fdcae7acccfd1.zip
chromium_src-b4596cb08fdd4933f55a7298b95fdcae7acccfd1.tar.gz
chromium_src-b4596cb08fdd4933f55a7298b95fdcae7acccfd1.tar.bz2
Re-enable SerializeHTMLDOMWithEntitiesInAttributeValue and SerializeHTMLDOMWithNonStandardEntities
since they are fixed by merging WebKit r66131 in http://src.chromium.org/viewvc/chrome?view=rev&revision=57724. No new tests are added since this is a test fix. BUG=53148 TEST=none Review URL: http://codereview.chromium.org/3270004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57768 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/dom_serializer_unittest.cc')
-rw-r--r--webkit/glue/dom_serializer_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/glue/dom_serializer_unittest.cc b/webkit/glue/dom_serializer_unittest.cc
index 68a4189..62b5a3d 100644
--- a/webkit/glue/dom_serializer_unittest.cc
+++ b/webkit/glue/dom_serializer_unittest.cc
@@ -584,7 +584,7 @@ TEST_F(DomSerializerTests, SerializeHTMLDOMWithEntitiesInText) {
// Test situation of html entities in attribute value when serializing
// HTML DOM.
// This test started to fail at WebKit r65388. See http://crbug.com/52279.
-TEST_F(DomSerializerTests, DISABLED_SerializeHTMLDOMWithEntitiesInAttributeValue) {
+TEST_F(DomSerializerTests, SerializeHTMLDOMWithEntitiesInAttributeValue) {
FilePath page_file_path = data_dir_;
page_file_path = page_file_path.AppendASCII(
"dom_serializer/htmlentities_in_attribute_value.htm");
@@ -634,7 +634,7 @@ TEST_F(DomSerializerTests, DISABLED_SerializeHTMLDOMWithEntitiesInAttributeValue
// Test situation of non-standard HTML entities when serializing HTML DOM.
// This test started to fail at WebKit r65351. See http://crbug.com/52279.
-TEST_F(DomSerializerTests, DISABLED_SerializeHTMLDOMWithNonStandardEntities) {
+TEST_F(DomSerializerTests, SerializeHTMLDOMWithNonStandardEntities) {
// Make a test file URL and load it.
FilePath page_file_path = data_dir_;
page_file_path = page_file_path.AppendASCII("dom_serializer");