Escape "--" in the page URL at page serialization

third_party/WebKit/Source/web/tests/WebPageSerializerTest.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 22 matching lines @@
 
 #include "platform/testing/URLTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebURL.h"
 #include "public/platform/WebURLRequest.h"
 #include "public/platform/WebURLResponse.h"
 #include "public/platform/WebUnitTestSupport.h"
 #include "public/web/WebDocument.h"
 #include "public/web/WebFrame.h"
+#include "public/web/WebPageSerializerClient.h"
 #include "public/web/WebView.h"
 #include "web/tests/FrameTestHelpers.h"
 #include <gtest/gtest.h>
 
 using blink::Document;
 using blink::URLTestHelpers::toKURL;
 
 namespace blink {
 
+namespace {
+class SimpleWebPageSerializerClient : public  WebPageSerializerClient {
+public:
+    std::string toString() const { return m_string; }
+
+private:
+    void didSerializeDataForFrame(const WebURL&, const WebCString& data, PageSerializationStatus) final
+    {
+        m_string += data;
+    }
+
+    std::string m_string;
+};
+
+} // namespace
+
 class WebPageSerializerTest : public testing::Test {
 public:
     WebPageSerializerTest() : m_supportedSchemes(static_cast<size_t>(3))
     {
         m_supportedSchemes[0] = "http";
         m_supportedSchemes[1] = "https";
         m_supportedSchemes[2] = "file";
     }
 
 protected:
@@ skipping 65 matching lines @@
     EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/trBackground.png"));
     EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/tdBackground.png"));
     EXPECT_TRUE(webVectorContains(resources, "http://www.evene.fr/citations/auteur.php?ida=46"));
     EXPECT_TRUE(webVectorContains(resources, "http://www.brainyquote.com/quotes/authors/c/charles_darwin.html"));
     EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/why_deleted.html"));
     EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/why_inserted.html"));
     EXPECT_TRUE(webVectorContains(resources, "https://www.secure.com/https.gif"));
     EXPECT_TRUE(webVectorContains(resources, "file://c/my_folder/file.gif"));
 }
 
+TEST_F(WebPageSerializerTest, fromUrlWithMinusMinus)
+{
+    WebURL topFrameURL = toKURL("http://www.test.com?--x--");
+    registerMockedURLLoad(topFrameURL.spec(), WebString::fromUTF8("text_only_page.html"));
+    loadURLInTopFrame(topFrameURL);
+
+    SimpleWebPageSerializerClient serializerClient;
+    WebVector<WebURL> links(&topFrameURL, 1);
+    WebVector<WebString> localPaths(&"local", 1);
+    WebPageSerializer::serialize(webView()->mainFrame()->toWebLocalFrame(), &serializerClient, links, localPaths, "");
+
+    EXPECT_EQ("<!-- saved from url=(0030)http://www.test.com/?-%2Dx-%2D -->", serializerClient.toString().substr(1, 60));
+}
+
 TEST_F(WebPageSerializerTest, MultipleFrames)
 {
     // Register the mocked frames.
     WebURL topFrameURL = toKURL("http://www.test.com");
     registerMockedURLLoad("http://www.test.com", WebString::fromUTF8("top_frame.html"));
     registerMockedURLLoad("http://www.test.com/simple_iframe.html",
                           WebString::fromUTF8("simple_iframe.html"));
     registerMockedURLLoad("http://www.test.com/object_iframe.html",
                           WebString::fromUTF8("object_iframe.html"));
     registerMockedURLLoad("http://www.test.com/embed_iframe.html",
@@ skipping 24 matching lines @@
     EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/innerFrame.png"));
     EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/flash.swf"));
     // FIXME: for some reason the following resources is missing on one of the bot
     //        causing the test to fail. Probably a plugin issue.
     // EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/music.mid"));
     EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/object.png"));
     EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/embed.png"));
 }
 
 } // namespace blink