Index: content/renderer/dom_serializer_browsertest.cc |
diff --git a/content/renderer/dom_serializer_browsertest.cc b/content/renderer/dom_serializer_browsertest.cc |
index 16bd30fb77f65fcdf8c28a4de60f051745f499d2..ebd502e9c4a1afd26cd3c3461b9910477beb23e9 100644 |
--- a/content/renderer/dom_serializer_browsertest.cc |
+++ b/content/renderer/dom_serializer_browsertest.cc |
@@ -809,7 +809,12 @@ IN_PROC_BROWSER_TEST_F(DomSerializerTests, SerializeHTMLDOMWithoutDocType) { |
// Serialize XML document which has all 5 built-in entities. After |
// finishing serialization, the serialized contents should be same |
// with original XML document. |
-IN_PROC_BROWSER_TEST_F(DomSerializerTests, SerializeXMLDocWithBuiltInEntities) { |
+// |
+// TODO(tiger@opera.com): Disabled in preparation of page serializer merge -- |
+// XML headers are handled differently in the merged serializer. |
+// Bug: http://crbug.com/328354 |
+IN_PROC_BROWSER_TEST_F(DomSerializerTests, |
+ DISABLED_SerializeXMLDocWithBuiltInEntities) { |
base::FilePath page_file_path = |
GetTestFilePath("dom_serializer", "note.html"); |
base::FilePath xml_file_path = GetTestFilePath("dom_serializer", "note.xml"); |
@@ -912,7 +917,7 @@ IN_PROC_BROWSER_TEST_F(DomSerializerTests, SerializeHTMLDOMWithEntitiesInText) { |
// Some attributes are handled differently in the merged serializer. |
// Bug: http://crbug.com/328354 |
IN_PROC_BROWSER_TEST_F(DomSerializerTests, |
- DISABLE_SerializeHTMLDOMWithEntitiesInAttributeValue) { |
+ DISABLED_SerializeHTMLDOMWithEntitiesInAttributeValue) { |
// Need to spin up the renderer and also navigate to a file url so that the |
// renderer code doesn't attempt a fork when it sees a load to file scheme |
// from non-file scheme. |
@@ -951,7 +956,7 @@ IN_PROC_BROWSER_TEST_F(DomSerializerTests, |
// Base tags are handled a bit different in merged version. |
// Bug: http://crbug.com/328354 |
IN_PROC_BROWSER_TEST_F(DomSerializerTests, |
- DISABLE_SerializeHTMLDOMWithBaseTag) { |
+ DISABLED_SerializeHTMLDOMWithBaseTag) { |
base::FilePath page_file_path = GetTestFilePath( |
"dom_serializer", "html_doc_has_base_tag.htm"); |