Move Location to DOMWindow

Source/web/tests/WebFrameTest.cpp

 /*
  * Copyright (C) 2010 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 6675 matching lines @@
 class WebFrameSwapTest : public WebFrameTest {
 protected:
     WebFrameSwapTest()
     {
         registerMockedHttpURLLoad("frame-a-b-c.html");
         registerMockedHttpURLLoad("subframe-a.html");
         registerMockedHttpURLLoad("subframe-b.html");
         registerMockedHttpURLLoad("subframe-c.html");
         registerMockedHttpURLLoad("subframe-hello.html");
 
-        m_webViewHelper.initializeAndLoad(m_baseURL + "frame-a-b-c.html");
+        m_webViewHelper.initializeAndLoad(m_baseURL + "frame-a-b-c.html", true);
     }
 
     void reset() { m_webViewHelper.reset(); }
     WebFrame* mainFrame() const { return m_webViewHelper.webView()->mainFrame(); }
 
 private:
     FrameTestHelpers::WebViewHelper m_webViewHelper;
 };
 
 TEST_F(WebFrameSwapTest, SwapMainFrame)
@@ skipping 199 matching lines @@
     localFrame->initializeToReplaceRemoteFrame(remoteFrame);
     FrameTestHelpers::loadFrame(localFrame, m_baseURL + "subframe-hello.html");
     EXPECT_EQ(WebStandardCommit, client.historyCommitType());
 
     // Manually reset to break WebViewHelper's dependency on the stack allocated
     // TestWebFrameClient.
     reset();
     remoteFrame->close();
 }
 
+class RemoteNavigationClient : public FrameTestHelpers::TestWebRemoteFrameClient {
+public:
+    RemoteNavigationClient() { }

[dcheng, 2015/02/02 19:27:52]

Nit: I think it's fine to omit the constructor in this case.

[Nate Chapin, 2015/02/02 21:02:00]

Done.

+
+    void navigate(const WebURLRequest& request, bool shouldReplaceCurrentEntry) override
+    {
+        m_lastRequest = request;
+    }
+
+    const WebURLRequest& lastRequest() { return m_lastRequest; }

[dcheng, 2015/02/02 19:27:52]

Nit: const.

[Nate Chapin, 2015/02/02 21:01:59]

Done.

+
+    WebURLRequest m_lastRequest;

[dcheng, 2015/02/02 19:27:52]

Nit: make this private, since we have an accessor.

[Nate Chapin, 2015/02/02 21:02:00]

Done.

+};
+
+TEST_F(WebFrameSwapTest, NavigateRemoteFrameViaLocation)
+{
+    RemoteNavigationClient client;
+    WebRemoteFrame* remoteFrame = WebRemoteFrame::create(&client);
+    WebFrame* targetFrame = mainFrame()->firstChild();
+    ASSERT_TRUE(targetFrame);
+    targetFrame->swap(remoteFrame);
+    ASSERT_TRUE(mainFrame()->firstChild());
+    ASSERT_EQ(mainFrame()->firstChild(), remoteFrame);
+
+    remoteFrame->setReplicatedOrigin(WebSecurityOrigin::createFromString("http://127.0.0.1"));
+    mainFrame()->executeScript(WebScriptSource(
+        "document.getElementsByTagName('iframe')[0].contentWindow.location = 'data:text/html,hi'"));
+    ASSERT_FALSE(client.lastRequest().isNull());
+    EXPECT_EQ(WebURL(toKURL("data:text/html,hi")), client.lastRequest().url());
+
+    // Manually reset to break WebViewHelper's dependency on the stack allocated
+    // TestWebFrameClient.
+    reset();
+    remoteFrame->close();
+}
+
 class MockDocumentThreadableLoaderClient : public DocumentThreadableLoaderClient {
 public:
     MockDocumentThreadableLoaderClient() : m_failed(false) { }
     virtual void didFail(const ResourceError&) override { m_failed = true;}
 
     void reset() { m_failed = false; }
     bool failed() { return m_failed; }
 
     bool m_failed;
 };
@@ skipping 91 matching lines @@
     EXPECT_EQ(1u, frameClient.navigationalDataReceivedCount());
 
     // Neither should a page reload.
     localFrame->reload();
     EXPECT_EQ(4u, frameClient.provisionalLoadCount());
     EXPECT_FALSE(frameClient.wasLastProvisionalLoadATransition());
     EXPECT_EQ(1u, frameClient.navigationalDataReceivedCount());
 }
 
 } // namespace