Create base class for common functionality of Web{Local,Remote}Frame

third_party/WebKit/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 6966 matching lines @@
     // FIXME: Refactor some of this logic into WebViewHelper to make it easier to
     // write tests with a top-level remote frame.
     FrameTestHelpers::TestWebViewClient viewClient;
     FrameTestHelpers::TestWebRemoteFrameClient remoteClient;
     WebView* view = WebView::create(&viewClient);
     view->setMainFrame(remoteClient.frame());
     FrameTestHelpers::TestWebFrameClient childFrameClient;
     WebLocalFrame* childFrame = view->mainFrame()->toWebRemoteFrame()->createLocalChild(WebTreeScopeType::Document, "", WebSandboxFlags::None, &childFrameClient, nullptr, WebFrameOwnerProperties());
 
     // Purposely keep the LocalFrame alive so it's the last thing to be destroyed.
-    RefPtrWillBePersistent<Frame> childCoreFrame = toCoreFrame(childFrame);
+    RefPtrWillBePersistent<Frame> childCoreFrame = childFrame->toImplBase()->frame();
     view->close();
     childCoreFrame.clear();
 }
 
 class WebFrameSwapTest : public WebFrameTest {
 protected:
     WebFrameSwapTest()
     {
         registerMockedHttpURLLoad("frame-a-b-c.html");
         registerMockedHttpURLLoad("subframe-a.html");
@@ skipping 521 matching lines @@
 
     KURL destination = toKURL("data:text/html:destination");
     mainWindow->open(destination.string(), "frame1", "", mainWindow, mainWindow);
     ASSERT_FALSE(remoteClient.lastRequest().isNull());
     EXPECT_EQ(remoteClient.lastRequest().url(), WebURL(destination));
 
     // Pointing a named frame to an empty URL should just return a reference to
     // the frame's window without navigating it.
     RefPtrWillBeRawPtr<DOMWindow> result = mainWindow->open("", "frame1", "", mainWindow, mainWindow);
     EXPECT_EQ(remoteClient.lastRequest().url(), WebURL(destination));
-    EXPECT_EQ(result, toCoreFrame(remoteFrame)->domWindow());
+    EXPECT_EQ(result, remoteFrame->toImplBase()->frame()->domWindow());
 
     reset();
 }
 
 class RemoteWindowCloseClient : public FrameTestHelpers::TestWebViewClient {
 public:
     RemoteWindowCloseClient()
         : m_closed(false)
     {
     }
@@ skipping 10 matching lines @@
 };
 
 TEST_F(WebFrameTest, WindowOpenRemoteClose)
 {
     FrameTestHelpers::WebViewHelper mainWebView;
     mainWebView.initialize(true);
 
     // Create a remote window that will be closed later in the test.
     RemoteWindowCloseClient viewClient;
     FrameTestHelpers::TestWebRemoteFrameClient frameClient;
-    WebRemoteFrame* webRemoteFrame = frameClient.frame();
+    WebRemoteFrameImpl* webRemoteFrame = frameClient.frame();
 
     WebView* view = WebView::create(&viewClient);
     view->setMainFrame(webRemoteFrame);
     view->mainFrame()->setOpener(mainWebView.webView()->mainFrame());
     webRemoteFrame->setReplicatedOrigin(WebSecurityOrigin::createFromString("http://127.0.0.1"));
 
-    LocalFrame* localFrame = toLocalFrame(toCoreFrame(mainWebView.webView()->mainFrame()));
-    RemoteFrame* remoteFrame = toRemoteFrame(toCoreFrame(frameClient.frame()));
+    LocalFrame* localFrame = toLocalFrame(mainWebView.webView()->mainFrame()->toImplBase()->frame());
+    RemoteFrame* remoteFrame = webRemoteFrame->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());
@@ skipping 69 matching lines @@
 private:
     WebHistoryCommitType m_historyCommitType;
 };
 
 TEST_P(ParameterizedWebFrameTest, RemoteFrameInitialCommitType)
 {
     FrameTestHelpers::TestWebViewClient viewClient;
     FrameTestHelpers::TestWebRemoteFrameClient remoteClient;
     WebView* view = WebView::create(&viewClient);
     view->setMainFrame(remoteClient.frame());
-    toRemoteFrame(toCoreFrame(view->mainFrame()))->securityContext()->setReplicatedOrigin(SecurityOrigin::create(toKURL(m_baseURL)));
+    remoteClient.frame()->setReplicatedOrigin(WebSecurityOrigin::createFromString(WebString::fromUTF8(m_baseURL)));
 
     // If an iframe has a remote main frame, ensure the inital commit is correctly identified as WebInitialCommitInChildFrame.
     CommitTypeWebFrameClient childFrameClient;
     WebLocalFrame* childFrame = view->mainFrame()->toWebRemoteFrame()->createLocalChild(WebTreeScopeType::Document, "", WebSandboxFlags::None, &childFrameClient, nullptr, WebFrameOwnerProperties());
     registerMockedHttpURLLoad("foo.html");
     FrameTestHelpers::loadFrame(childFrame, m_baseURL + "foo.html");
     EXPECT_EQ(WebInitialCommitInChildFrame, childFrameClient.historyCommitType());
     view->close();
 }
 
@@ skipping 653 matching lines @@
 
 TEST_F(WebFrameTest, CallbackOrdering)
 {
     registerMockedHttpURLLoad("foo.html");
     FrameTestHelpers::WebViewHelper webViewHelper;
     CallbackOrderingWebFrameClient client;
     webViewHelper.initializeAndLoad(m_baseURL + "foo.html", true, &client);
 }
 
 } // namespace blink