Revert of Disable two DomSerializerTests in preperation of page serializer merge

content/renderer/dom_serializer_browsertest.cc

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..e6aae196def98b6213c94fe0e6cbed8bcb3bcc1c 100644
--- a/content/renderer/dom_serializer_browsertest.cc
+++ b/content/renderer/dom_serializer_browsertest.cc
@@ -907,12 +907,8 @@
 // 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.
-//
-// TODO(tiger@opera.com): Disabled in preparation of page serializer merge --
-// Some attributes are handled differently in the merged serializer.
-// Bug: http://crbug.com/328354
 IN_PROC_BROWSER_TEST_F(DomSerializerTests,
-                       DISABLE_SerializeHTMLDOMWithEntitiesInAttributeValue) {

[jochen (gone - plz use gerrit), 2013/12/17 19:07:13]

ah, right. It should be DISABLED_ (with a D)

can you fix that instead of reverting, or don't you need those anymore?

+                       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.
@@ -946,12 +942,7 @@
 // When serializing, we should comment the BASE tag, append a new BASE tag.
 // rewrite all the savable URLs to relative local path, and change other URLs
 // to absolute URLs.
-//
-// TODO(tiger@opera.com): Disabled in preparation of page serializer merge --
-// Base tags are handled a bit different in merged version.
-// Bug: http://crbug.com/328354
-IN_PROC_BROWSER_TEST_F(DomSerializerTests,
-                       DISABLE_SerializeHTMLDOMWithBaseTag) {
+IN_PROC_BROWSER_TEST_F(DomSerializerTests, SerializeHTMLDOMWithBaseTag) {
   base::FilePath page_file_path = GetTestFilePath(
       "dom_serializer", "html_doc_has_base_tag.htm");