Merge page serializers [1/12]

Source/web/tests/WebPageNewSerializerTest.cpp

Index: Source/web/tests/WebPageNewSerializerTest.cpp
diff --git a/Source/web/tests/WebPageNewSerializerTest.cpp b/Source/web/tests/WebPageNewSerializerTest.cpp
index 7bf8d15a038d9d6a6c4901962c88594b30618777..d4d56a6f37318fe107089d1ff54f0b8cf97ee1af 100644
--- a/Source/web/tests/WebPageNewSerializerTest.cpp
+++ b/Source/web/tests/WebPageNewSerializerTest.cpp
@@ -380,29 +380,6 @@ TEST_F(WebPageNewSerializeTest, SVGImageDontCrash)
 }
 
 
-TEST_F(WebPageNewSerializeTest, DontIncludeErrorImage)
-{
-    WebURL pageUrl = toKURL(m_baseURL);
-    WebURL imageUrl = toTestURL("error_image.png");
-
-    registerMockedURLLoad(pageUrl, WebString::fromUTF8("page_with_img_error.html"), WebString::fromUTF8("pageserializer/"), htmlMimeType());
-    registerMockedURLLoad(imageUrl, WebString::fromUTF8("error_image.png"), WebString::fromUTF8("pageserializer/"), pngMimeType());
-
-    loadURLInTopFrame(pageUrl);
-
-    WebCString mhtmlData = WebPageSerializer::serializeToMHTML(webView());
-    ASSERT_FALSE(mhtmlData.isEmpty());
-
-    // Sniff the MHTML data to make sure image content is excluded.
-    LineReader lineReader(std::string(mhtmlData.data()));
-    std::string line;
-    while (lineReader.getNextLine(&line)) {
-        if (line.find("image/") != std::string::npos)
-            FAIL() << "Error Image was not excluded " << line;
-    }
-}
-
-
 TEST_F(WebPageNewSerializeTest, NamespaceElementsDontCrash)
 {
     WebURL pageUrl = toKURL(m_baseURL);