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 7301 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::TestWebViewClient {
+public:
+    RemoteWindowCloseClient()
+        : m_closed(false)
+    {
+    }
+
+    void closeWidgetSoon() override
+    {
+        m_closed = true;
+    }
+
+    bool closed() const { return m_closed; }
+
+private:
+    bool m_closed;
+};
+
+TEST_F(WebFrameSwapTest, WindowOpenRemoteClose)

[dcheng, 2015/06/17 23:39:50]

I don't think there's any need to inherit from the test fixture, since we don't
really need the test fixture.

[nasko, 2015/06/19 13:23:22]

Do you mean inherit just from WebFrameTest instead of WebFrameSwap test? If so,
done.

+{
+    // Create a remote window that will be closed later in the test.
+    RemoteWindowCloseClient viewClient;
+    FrameTestHelpers::TestWebRemoteFrameClient frameClient;
+    WebRemoteFrame* webRemoteFrame = frameClient.frame();
+
+    WebView* view = WebView::create(&viewClient);
+    view->setMainFrame(webRemoteFrame);
+    view->mainFrame()->setOpener(mainFrame());
+    webRemoteFrame->setReplicatedOrigin(WebSecurityOrigin::createFromString("http://127.0.0.1"));
+
+    LocalFrame* localFrame = toLocalFrame(toCoreFrame(mainFrame()));

[dcheng, 2015/06/17 23:39:50]

Let's just use FrameTestHelpers::WebViewHelper directly here, since we don't
need all of the remote frame stuff.

[nasko, 2015/06/19 13:23:22]

I'm not sure I follow here. I've changed this test from WebFrameSwapTest to
WebFrameTest, which meant I need to have a WebViewHelper for the initial view. I
still need to have another WebView for the opened window, which has a
RemoteFrame as its main frame. Is there a way to use WebViewHelper to create a
WebView with RemoteFrame as the main one? I didn't see it, as its initialize()
method uses WebLocaFrame in the call to setMainFrame.

[dcheng, 2015/06/20 00:41:32]

What you have now is fine.

+    RemoteFrame* remoteFrame = toRemoteFrame(toCoreFrame(frameClient.frame()));
+
+    // Attempt to close the window, which should fail as it isn't opened
+    // by a script.
+    remoteFrame->domWindow()->close(localFrame->document());
+    EXPECT_FALSE(viewClient.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(viewClient.closed());
+
+    reset();

[dcheng, 2015/06/17 23:39:50]

Make sure you call view->close() and whatever else necessary so we don't leak
objects.

[nasko, 2015/06/19 13:23:22]

I thought view->close() is equivalent to the above call of
remoteFrame->domWindow()->close(). Fixed.

+}
+
 class CommitTypeWebFrameClient : public FrameTestHelpers::TestWebFrameClient {
 public:
     explicit CommitTypeWebFrameClient()
         : m_historyCommitType(WebHistoryInertCommit)
     {
     }
 
     void didCommitProvisionalLoad(WebLocalFrame*, const WebHistoryItem&, WebHistoryCommitType historyCommitType) override
     {
         m_historyCommitType = historyCommitType;
@@ skipping 403 matching lines @@
 
 TEST_F(WebFrameTest, MaxFramesDetach)
 {
     registerMockedHttpURLLoad("max-frames-detach.html");
     FrameTestHelpers::WebViewHelper webViewHelper;
     WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "max-frames-detach.html", true);
     webViewImpl->mainFrameImpl()->collectGarbage();
 }
 
 } // namespace blink