Merge page serializers [1/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 362 matching lines @@
     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, 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);
     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;
@@ skipping 80 matching lines @@
     // exactly two times.
     size_t nbDataURLs = 0;
     LineReader lineReader(std::string(mhtmlData.data()));
     std::string line;
     while (lineReader.getNextLine(&line)) {
         if (line.find("data:text") != std::string::npos)
             nbDataURLs++;
     }
     EXPECT_EQ(2u, nbDataURLs);
 }