Merge page serializers [5/12]

Source/web/tests/WebPageNewSerializerTest.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 220 matching lines @@
     EXPECT_TRUE(resourceVectorContains(resources, m_baseURL + "red_background.png", "image/png"));
     EXPECT_TRUE(resourceVectorContains(resources, m_baseURL + "orange_background.png", "image/png"));
     EXPECT_TRUE(resourceVectorContains(resources, m_baseURL + "yellow_background.png", "image/png"));
     EXPECT_TRUE(resourceVectorContains(resources, m_baseURL + "green_background.png", "image/png"));
     EXPECT_TRUE(resourceVectorContains(resources, m_baseURL + "blue_background.png", "image/png"));
     EXPECT_TRUE(resourceVectorContains(resources, m_baseURL + "purple_background.png", "image/png"));
     EXPECT_TRUE(resourceVectorContains(resources, m_baseURL + "ul-dot.png", "image/png"));
     EXPECT_TRUE(resourceVectorContains(resources, m_baseURL + "ol-dot.png", "image/png"));
 }
 
-TEST_F(WebPageNewSerializeTest, SerializeXMLHasRightDeclaration)
-{
-    WebURL topFrameURL = toTestURL("simple.xhtml");
-    registerMockedURLLoad(topFrameURL, WebString::fromUTF8("simple.xhtml"), WebString::fromUTF8("pageserializer/"), xhtmlMimeType());
-
-    loadURLInTopFrame(topFrameURL);
-
-    WebVector<WebPageSerializer::Resource> resources;
-    WebPageSerializer::serialize(webView(), &resources);
-    ASSERT_FALSE(resources.isEmpty());
-
-    // We expect only one resource, the XML.
-    ASSERT_EQ(1U, resources.size());
-    std::string xml = std::string(resources[0].data.data());
-
-    // We should have one and only one instance of the XML declaration.
-    size_t pos = xml.find("<?xml version=");
-    ASSERT_TRUE(pos != std::string::npos);
-
-    pos = xml.find("<?xml version=", pos + 1);
-    ASSERT_TRUE(pos == std::string::npos);
-}
-
 TEST_F(WebPageNewSerializeTest, FAILS_TestMHTMLEncoding)
 {
     // Load a page with some CSS and some images.
     WebURL topFrameURL = setUpCSSTestPage();
     loadURLInTopFrame(topFrameURL);
 
     WebCString mhtmlData = WebPageSerializer::serializeToMHTML(webView());
     ASSERT_FALSE(mhtmlData.isEmpty());
 
     // Read the MHTML data line per line and do some pseudo-parsing to make sure the right encoding is used for the different sections.
@@ skipping 20 matching lines @@
            ASSERT_TRUE(expectedEncoding);
            EXPECT_TRUE(line.find(expectedEncoding) != std::string::npos);
            expectedEncoding = 0;
            sectionCheckedCount++;
         }
     }
     EXPECT_EQ(12, sectionCheckedCount);
 }
 
 }