Merge page serializers [3/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 345 matching lines @@
         if (!line.find("Content-Transfer-Encoding:")) {
            ASSERT_TRUE(expectedEncoding);
            EXPECT_TRUE(line.find(expectedEncoding) != std::string::npos);
            expectedEncoding = 0;
            sectionCheckedCount++;
         }
     }
     EXPECT_EQ(12, sectionCheckedCount);
 }
 
-// Test that we don't regress https://bugs.webkit.org/show_bug.cgi?id=99105
-TEST_F(WebPageNewSerializeTest, SVGImageDontCrash)
-{
-    WebURL pageUrl = toKURL(m_baseURL);
-    WebURL imageUrl = toTestURL("green_rectangle.svg");
-
-    registerMockedURLLoad(pageUrl, WebString::fromUTF8("page_with_svg_image.html"), WebString::fromUTF8("pageserializer/"), htmlMimeType());
-    registerMockedURLLoad(imageUrl, WebString::fromUTF8("green_rectangle.svg"), WebString::fromUTF8("pageserializer/"), svgMimeType());
-
-    loadURLInTopFrame(pageUrl);
-
-    WebCString mhtml = WebPageSerializer::serializeToMHTML(webView());
-    // We expect some data to be generated.
-    EXPECT_GT(mhtml.length(), 50U);
-}
-
-
-TEST_F(WebPageNewSerializeTest, NamespaceElementsDontCrash)
-{
-    WebURL pageUrl = toKURL(m_baseURL);
-    registerMockedURLLoad(pageUrl, WebString::fromUTF8("namespace_element.html"), WebString::fromUTF8("pageserializer/"), htmlMimeType());
-
-    loadURLInTopFrame(pageUrl);
-
-    WebVector<WebURL> localLinks(static_cast<size_t>(1));
-    WebVector<WebString> localPaths(static_cast<size_t>(1));
-    localLinks[0] = pageUrl;
-    localPaths[0] = WebString("/");
-
-    size_t counter = 0;
-    LengthCountingWebPageSerializerClient client(&counter);
-
-    // We just want to make sure nothing crazy happens, namely that no
-    // assertions are hit. As a sanity check, we also make sure that some data
-    // was returned.
-    WebPageSerializer::serialize(webView()->mainFrame()->toWebLocalFrame(), true, &client, localLinks, localPaths, WebString(""));
-
-    EXPECT_GT(counter, 0U);
-}
-
 TEST_F(WebPageNewSerializeTest, SubFrameSerialization)
 {
     WebURL pageUrl = toKURL(m_baseURL);
     registerMockedURLLoad(pageUrl, WebString::fromUTF8("top_frame.html"), WebString::fromUTF8("pageserializer/"), htmlMimeType());
     registerMockedURLLoad(toTestURL("iframe.html"), WebString::fromUTF8("iframe.html"), WebString::fromUTF8("pageserializer/"), htmlMimeType());
     registerMockedURLLoad(toTestURL("iframe2.html"), WebString::fromUTF8("iframe2.html"), WebString::fromUTF8("pageserializer/"), htmlMimeType());
     registerMockedURLLoad(toTestURL("red_background.png"), WebString::fromUTF8("red_background.png"), WebString::fromUTF8("pageserializer/"), pngMimeType());
     registerMockedURLLoad(toTestURL("green_background.png"), WebString::fromUTF8("green_background.png"), WebString::fromUTF8("pageserializer/"), pngMimeType());
     registerMockedURLLoad(toTestURL("blue_background.png"), WebString::fromUTF8("blue_background.png"), WebString::fromUTF8("pageserializer/"), pngMimeType());
 
@@ skipping 12 matching lines @@
     // We just want to make sure nothing crazy happens, namely that no
     // assertions are hit. As a sanity check, we also make sure that some data
     // was returned.
     WebPageSerializer::serialize(webView()->mainFrame()->toWebLocalFrame(), true, &client, localLinks, localPaths, WebString(""));
 
     // Subframe src
     EXPECT_TRUE(static_cast<String>(serializedData).contains("src=\"SavedFiles/iframe.html\""));
 }
 
 }