Move window.close implementation 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 7295 matching lines @@
     ASSERT_TRUE(mainFrame()->isWebLocalFrame());
     ASSERT_TRUE(mainFrame()->firstChild()->isWebRemoteFrame());
     LocalDOMWindow* mainWindow = toWebLocalFrameImpl(mainFrame())->frame()->localDOMWindow();
     mainWindow->open(destination.string(), "frame1", "", mainWindow, mainWindow);
     ASSERT_FALSE(remoteClient.lastRequest().isNull());
     EXPECT_EQ(remoteClient.lastRequest().url(), WebURL(destination));
 
     reset();
 }
 
+class RemoteWindowCloseClient : public FrameTestHelpers::TestWebRemoteFrameClient {
+public:
+    void close() override
+    {
+        m_closed = true;
+    }
+
+    bool closed() const { return m_closed; }
+
+private:
+    bool m_closed;
+};
+
+TEST_F(WebFrameSwapTest, WindowOpenRemoteClose)
+{
+    // Create another window that will be closed later in the test.
+    FrameTestHelpers::WebViewHelper newWebViewHelper;
+    WebView* newView = newWebViewHelper.initialize(true);
+    newView->mainFrame()->setOpener(mainFrame());
+    newView->mainFrame()->setName("foo");
+    runPendingTasks();

[dcheng, 2015/06/11 02:00:06]

Is this necessary? If so, it'd be nice to document why.

+
+    // Swap the new window to be remote.
+    RemoteWindowCloseClient remoteClient;
+    WebRemoteFrame* webRemoteFrame = remoteClient.frame();
+    newView->mainFrame()->swap(webRemoteFrame);
+    webRemoteFrame->setReplicatedOrigin(WebSecurityOrigin::createFromString("http://127.0.0.1"));
+
+    LocalFrame* localFrame = toLocalFrame(toCoreFrame(mainFrame()));
+    RemoteFrame* remoteFrame = toRemoteFrame(toCoreFrame(webRemoteFrame));
+
+    // Attempt to close the window, which should fail as it isn't opened
+    // by a script.
+    remoteFrame->domWindow()->close(localFrame->document());
+    EXPECT_FALSE(remoteClient.closed());
+
+    // Marking it as opened by a script should now allow it to be closed.
+    remoteFrame->page()->setOpenedByDOM();
+    remoteFrame->domWindow()->close(localFrame->document());
+    EXPECT_TRUE(remoteClient.closed());
+
+    reset();
+}
+
+
 class CommitTypeWebFrameClient : public FrameTestHelpers::TestWebFrameClient {
 public:
     explicit CommitTypeWebFrameClient()
         : m_historyCommitType(WebHistoryInertCommit)
     {
     }
 
     void didCommitProvisionalLoad(WebLocalFrame*, const WebHistoryItem&, WebHistoryCommitType historyCommitType) override
     {
         m_historyCommitType = historyCommitType;
@@ skipping 395 matching lines @@
 TEST_F(WebFrameTest, OrientationFrameDetach)
 {
     RuntimeEnabledFeatures::setOrientationEventEnabled(true);
     registerMockedHttpURLLoad("orientation-frame-detach.html");
     FrameTestHelpers::WebViewHelper webViewHelper;
     WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "orientation-frame-detach.html", true);
     webViewImpl->mainFrameImpl()->sendOrientationChangeEvent();
 }
 
 } // namespace blink