Rename [Web]PageSerializer[Test|Client|Impl] to ...FrameSerializer...

third_party/WebKit/Source/web/tests/FrameSerializerTest.cpp

Index: third_party/WebKit/Source/web/tests/FrameSerializerTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/PageSerializerTest.cpp b/third_party/WebKit/Source/web/tests/FrameSerializerTest.cpp
similarity index 87%
rename from third_party/WebKit/Source/web/tests/PageSerializerTest.cpp
rename to third_party/WebKit/Source/web/tests/FrameSerializerTest.cpp
index f333ef5a89b1046d3cb83b8bd3163695b5c2fdbe..002cc9d48365532b65aadeeb20565a81783ecf61 100644
--- a/third_party/WebKit/Source/web/tests/PageSerializerTest.cpp
+++ b/third_party/WebKit/Source/web/tests/FrameSerializerTest.cpp
@@ -28,11 +28,10 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "core/page/PageSerializer.h"
+#include "core/frame/FrameSerializer.h"
 
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8BindingForTesting.h"
-#include "core/page/Page.h"
 #include "platform/SerializedResource.h"
 #include "platform/testing/URLTestHelpers.h"
 #include "public/platform/Platform.h"
@@ -55,12 +54,12 @@ using blink::URLTestHelpers::registerMockedURLLoad;
 
 namespace blink {
 
-class PageSerializerTest
+class FrameSerializerTest
     : public testing::Test
-    , public PageSerializer::Delegate {
+    , public FrameSerializer::Delegate {
 public:
-    PageSerializerTest()
-        : m_folder(WebString::fromUTF8("pageserializer/"))
+    FrameSerializerTest()
+        : m_folder(WebString::fromUTF8("frameserializer/"))
         , m_baseUrl(toKURL("http://www.test.com"))
     {
     }
@@ -101,7 +100,7 @@ protected:
     {
         WebURLError error;
         error.reason = 0xdead + statusCode;
-        error.domain = "PageSerializerTest";
+        error.domain = "FrameSerializerTest";
 
         WebURLResponse response;
         response.initialize();
@@ -119,7 +118,7 @@ protected:
     void serialize(const char* url)
     {
         FrameTestHelpers::loadFrame(m_helper.webView()->mainFrame(), KURL(m_baseUrl, url).string().utf8().data());
-        PageSerializer serializer(m_resources, *this);
+        FrameSerializer serializer(m_resources, *this);
         Frame* frame = m_helper.webViewImpl()->mainFrameImpl()->frame();
         for (; frame; frame = frame->tree().traverseNext()) {
             // This is safe, because tests do not do cross-site navigation
@@ -167,7 +166,7 @@ private:
         settings->setJavaScriptEnabled(true);
     }
 
-    // PageSerializer::Delegate implementation.
+    // FrameSerializer::Delegate implementation.
     bool rewriteLink(const Element& element, String& rewrittenLink)
     {
         String completeURL;
@@ -197,9 +196,9 @@ private:
     String m_rewriteFolder;
 };
 
-TEST_F(PageSerializerTest, HTMLElements)
+TEST_F(FrameSerializerTest, HTMLElements)
 {
-    setBaseFolder("pageserializer/elements/");
+    setBaseFolder("frameserializer/elements/");
 
     registerURL("elements.html", "text/html");
     registerURL("style.css", "style.css", "text/css");
@@ -238,9 +237,9 @@ TEST_F(PageSerializerTest, HTMLElements)
     EXPECT_FALSE(isSerialized("nonExisting.png", "image/png"));
 }
 
-TEST_F(PageSerializerTest, Frames)
+TEST_F(FrameSerializerTest, Frames)
 {
-    setBaseFolder("pageserializer/frames/");
+    setBaseFolder("frameserializer/frames/");
 
     registerURL("simple_frames.html", "text/html");
     registerURL("simple_frames_top.html", "text/html");
@@ -267,9 +266,9 @@ TEST_F(PageSerializerTest, Frames)
     EXPECT_TRUE(isSerialized("frame_4.png", "image/png"));
 }
 
-TEST_F(PageSerializerTest, IFrames)
+TEST_F(FrameSerializerTest, IFrames)
 {
-    setBaseFolder("pageserializer/frames/");
+    setBaseFolder("frameserializer/frames/");
 
     registerURL("top_frame.html", "text/html");
     registerURL("simple_iframe.html", "text/html");
@@ -297,7 +296,7 @@ TEST_F(PageSerializerTest, IFrames)
     EXPECT_TRUE(isSerialized("object.png", "image/png"));
     EXPECT_TRUE(isSerialized("embed.png", "image/png"));
 
-    // Ensure that page contents are not NFC-normalized before encoding.
+    // Ensure that frame contents are not NFC-normalized before encoding.
     String expectedMetaCharset = "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=EUC-KR\">";
     EXPECT_TRUE(getSerializedData("encoded_iframe.html", "text/html").contains(expectedMetaCharset));
     EXPECT_TRUE(getSerializedData("encoded_iframe.html", "text/html").contains("\xE4\xC5\xD1\xE2"));
@@ -305,9 +304,9 @@ TEST_F(PageSerializerTest, IFrames)
 }
 
 // Tests that when serializing a page with blank frames these are reported with their resources.
-TEST_F(PageSerializerTest, BlankFrames)
+TEST_F(FrameSerializerTest, BlankFrames)
 {
-    setBaseFolder("pageserializer/frames/");
+    setBaseFolder("frameserializer/frames/");
 
     registerURL("blank_frames.html", "text/html");
     registerURL("red_background.png", "image.png", "image/png");
@@ -329,9 +328,9 @@ TEST_F(PageSerializerTest, BlankFrames)
     // (i.e. SavePageMultiFrameBrowserTest.AboutBlank).
 }
 
-TEST_F(PageSerializerTest, CSS)
+TEST_F(FrameSerializerTest, CSS)
 {
-    setBaseFolder("pageserializer/css/");
+    setBaseFolder("frameserializer/css/");
 
     registerURL("css_test_page.html", "text/html");
     registerURL("link_styles.css", "text/css");
@@ -383,9 +382,9 @@ TEST_F(PageSerializerTest, CSS)
     EXPECT_FALSE(getSerializedData("encoding.css", "text/css").contains("\xE4\xC5\xE4\xC5"));
 }
 
-TEST_F(PageSerializerTest, CSSImport)
+TEST_F(FrameSerializerTest, CSSImport)
 {
-    setBaseFolder("pageserializer/css/");
+    setBaseFolder("frameserializer/css/");
 
     registerURL("import.html", "text/html");
     registerURL("import/base.css", "text/css");
@@ -400,10 +399,10 @@ TEST_F(PageSerializerTest, CSSImport)
     EXPECT_TRUE(isSerialized("import/absolute/green-header.css", "text/css"));
 }
 
-TEST_F(PageSerializerTest, XMLDeclaration)
+TEST_F(FrameSerializerTest, XMLDeclaration)
 {
     V8TestingScope scope(v8::Isolate::GetCurrent());
-    setBaseFolder("pageserializer/xml/");
+    setBaseFolder("frameserializer/xml/");
 
     registerURL("xmldecl.xml", "text/xml");
     serialize("xmldecl.xml");
@@ -412,9 +411,9 @@ TEST_F(PageSerializerTest, XMLDeclaration)
     EXPECT_TRUE(getSerializedData("xmldecl.xml").startsWith(expectedStart));
 }
 
-TEST_F(PageSerializerTest, DTD)
+TEST_F(FrameSerializerTest, DTD)
 {
-    setBaseFolder("pageserializer/dtd/");
+    setBaseFolder("frameserializer/dtd/");
 
     registerURL("html5.html", "text/html");
     serialize("html5.html");
@@ -423,9 +422,9 @@ TEST_F(PageSerializerTest, DTD)
     EXPECT_TRUE(getSerializedData("html5.html").startsWith(expectedStart));
 }
 
-TEST_F(PageSerializerTest, Font)
+TEST_F(FrameSerializerTest, Font)
 {
-    setBaseFolder("pageserializer/font/");
+    setBaseFolder("frameserializer/font/");
 
     registerURL("font.html", "text/html");
     registerURL("font.ttf", "application/octet-stream");
@@ -435,9 +434,9 @@ TEST_F(PageSerializerTest, Font)
     EXPECT_TRUE(isSerialized("font.ttf", "application/octet-stream"));
 }
 
-TEST_F(PageSerializerTest, DataURI)
+TEST_F(FrameSerializerTest, DataURI)
 {
-    setBaseFolder("pageserializer/datauri/");
+    setBaseFolder("frameserializer/datauri/");
 
     registerURL("page_with_data.html", "text/html");
 
@@ -447,9 +446,9 @@ TEST_F(PageSerializerTest, DataURI)
     EXPECT_TRUE(isSerialized("page_with_data.html", "text/html"));
 }
 
-TEST_F(PageSerializerTest, DataURIMorphing)
+TEST_F(FrameSerializerTest, DataURIMorphing)
 {
-    setBaseFolder("pageserializer/datauri/");
+    setBaseFolder("frameserializer/datauri/");
 
     registerURL("page_with_morphing_data.html", "text/html");
 
@@ -459,9 +458,9 @@ TEST_F(PageSerializerTest, DataURIMorphing)
     EXPECT_TRUE(isSerialized("page_with_morphing_data.html", "text/html"));
 }
 
-TEST_F(PageSerializerTest, RewriteLinksSimple)
+TEST_F(FrameSerializerTest, RewriteLinksSimple)
 {
-    setBaseFolder("pageserializer/rewritelinks/");
+    setBaseFolder("frameserializer/rewritelinks/");
     setRewriteURLFolder("folder");
 
     registerURL("rewritelinks_simple.html", "text/html");
@@ -478,9 +477,9 @@ TEST_F(PageSerializerTest, RewriteLinksSimple)
 }
 
 // Test that we don't regress https://bugs.webkit.org/show_bug.cgi?id=99105
-TEST_F(PageSerializerTest, SVGImageDontCrash)
+TEST_F(FrameSerializerTest, SVGImageDontCrash)
 {
-    setBaseFolder("pageserializer/svg/");
+    setBaseFolder("frameserializer/svg/");
 
     registerURL("page_with_svg_image.html", "text/html");
     registerURL("green_rectangle.svg", "image/svg+xml");
@@ -493,9 +492,9 @@ TEST_F(PageSerializerTest, SVGImageDontCrash)
     EXPECT_GT(getSerializedData("green_rectangle.svg", "image/svg+xml").length(), 250U);
 }
 
-TEST_F(PageSerializerTest, DontIncludeErrorImage)
+TEST_F(FrameSerializerTest, DontIncludeErrorImage)
 {
-    setBaseFolder("pageserializer/image/");
+    setBaseFolder("frameserializer/image/");
 
     registerURL("page_with_img_error.html", "text/html");
     registerURL("error_image.png", "image/png");
@@ -507,9 +506,9 @@ TEST_F(PageSerializerTest, DontIncludeErrorImage)
     EXPECT_FALSE(isSerialized("error_image.png", "image/png"));
 }
 
-TEST_F(PageSerializerTest, NamespaceElementsDontCrash)
+TEST_F(FrameSerializerTest, NamespaceElementsDontCrash)
 {
-    setBaseFolder("pageserializer/namespace/");
+    setBaseFolder("frameserializer/namespace/");
 
     registerURL("namespace_element.html", "text/html");
 
@@ -520,15 +519,15 @@ TEST_F(PageSerializerTest, NamespaceElementsDontCrash)
     EXPECT_GT(getSerializedData("namespace_element.html", "text/html").length(), 0U);
 }
 
-TEST_F(PageSerializerTest, markOfTheWebDeclaration)
+TEST_F(FrameSerializerTest, markOfTheWebDeclaration)
 {
-    EXPECT_EQ("saved from url=(0015)http://foo.com/", PageSerializer::markOfTheWebDeclaration(KURL(ParsedURLString, "http://foo.com")));
-    EXPECT_EQ("saved from url=(0015)http://f-o.com/", PageSerializer::markOfTheWebDeclaration(KURL(ParsedURLString, "http://f-o.com")));
-    EXPECT_EQ("saved from url=(0019)http://foo.com-%2D/", PageSerializer::markOfTheWebDeclaration(KURL(ParsedURLString, "http://foo.com--")));
-    EXPECT_EQ("saved from url=(0024)http://f-%2D.com-%2D%3E/", PageSerializer::markOfTheWebDeclaration(KURL(ParsedURLString, "http://f--.com-->")));
-    EXPECT_EQ("saved from url=(0020)http://foo.com/?-%2D", PageSerializer::markOfTheWebDeclaration(KURL(ParsedURLString, "http://foo.com?--")));
-    EXPECT_EQ("saved from url=(0020)http://foo.com/#-%2D", PageSerializer::markOfTheWebDeclaration(KURL(ParsedURLString, "http://foo.com#--")));
-    EXPECT_EQ("saved from url=(0026)http://foo.com/#bar-%2Dbaz", PageSerializer::markOfTheWebDeclaration(KURL(ParsedURLString, "http://foo.com#bar--baz")));
+    EXPECT_EQ("saved from url=(0015)http://foo.com/", FrameSerializer::markOfTheWebDeclaration(KURL(ParsedURLString, "http://foo.com")));
+    EXPECT_EQ("saved from url=(0015)http://f-o.com/", FrameSerializer::markOfTheWebDeclaration(KURL(ParsedURLString, "http://f-o.com")));
+    EXPECT_EQ("saved from url=(0019)http://foo.com-%2D/", FrameSerializer::markOfTheWebDeclaration(KURL(ParsedURLString, "http://foo.com--")));
+    EXPECT_EQ("saved from url=(0024)http://f-%2D.com-%2D%3E/", FrameSerializer::markOfTheWebDeclaration(KURL(ParsedURLString, "http://f--.com-->")));
+    EXPECT_EQ("saved from url=(0020)http://foo.com/?-%2D", FrameSerializer::markOfTheWebDeclaration(KURL(ParsedURLString, "http://foo.com?--")));
+    EXPECT_EQ("saved from url=(0020)http://foo.com/#-%2D", FrameSerializer::markOfTheWebDeclaration(KURL(ParsedURLString, "http://foo.com#--")));
+    EXPECT_EQ("saved from url=(0026)http://foo.com/#bar-%2Dbaz", FrameSerializer::markOfTheWebDeclaration(KURL(ParsedURLString, "http://foo.com#bar--baz")));
 }
 
 } // namespace blink