Revert of Disable two DomSerializerTests in preperation of page serializer merge

content/renderer/dom_serializer_browsertest.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/containers/hash_tables.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
@@ skipping 889 matching lines @@
 
   PostTaskToInProcessRendererAndWait(
         base::Bind(
             &DomSerializerTests::SerializeHTMLDOMWithEntitiesInTextOnRenderer,
             base::Unretained(this)));
 }
 
 // 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.
   NavigateToURL(shell(), GetTestUrl(".", "simple_page.html"));
 
   PostTaskToInProcessRendererAndWait(
         base::Bind(
             &DomSerializerTests::
                 SerializeHTMLDOMWithEntitiesInAttributeValueOnRenderer,
             base::Unretained(this)));
@@ skipping 13 matching lines @@
         base::Bind(
             &DomSerializerTests::
                 SerializeHTMLDOMWithNonStandardEntitiesOnRenderer,
             base::Unretained(this), file_url));
 }
 
 // Test situation of BASE tag in original document when serializing HTML DOM.
 // 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");
 
   // Get page dir URL which is base URL of this file.
   base::FilePath dir_name = page_file_path.DirName();
   dir_name = dir_name.Append(
       base::FilePath::StringType(base::FilePath::kSeparators[0], 1));
   GURL path_dir_url = net::FilePathToFileURL(dir_name);
 
   // Get file URL.
@@ skipping 46 matching lines @@
   NavigateToURL(shell(), file_url);
 
   PostTaskToInProcessRendererAndWait(
         base::Bind(
             &DomSerializerTests::
                 SubResourceForElementsInNonHTMLNamespaceOnRenderer,
             base::Unretained(this), file_url));
 }
 
 }  // namespace content