Nuked WebFrameImplBase.

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 8699 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 view_client;
   FrameTestHelpers::TestWebRemoteFrameClient remote_client;
   WebView* view = WebView::Create(&view_client, kWebPageVisibilityStateVisible);
   view->SetMainFrame(remote_client.GetFrame());
   WebLocalFrame* child_frame =
       FrameTestHelpers::CreateLocalChild(view->MainFrame()->ToWebRemoteFrame());
 
   // Purposely keep the LocalFrame alive so it's the last thing to be destroyed.
-  Persistent<Frame> child_core_frame = child_frame->ToImplBase()->GetFrame();
+  Persistent<Frame> child_core_frame = WebFrame::ToCoreFrame(*child_frame);
   view->Close();
   child_core_frame.Clear();
 }
 
 class WebFrameSwapTest : public WebFrameTest {
  protected:
   WebFrameSwapTest() {
     RegisterMockedHttpURLLoad("frame-a-b-c.html");
     RegisterMockedHttpURLLoad("subframe-a.html");
     RegisterMockedHttpURLLoad("subframe-b.html");
@@ skipping 674 matching lines @@
   main_window->open(destination.GetString(), "frame1", "", main_window,
                     main_window);
   ASSERT_FALSE(remote_client.LastRequest().IsNull());
   EXPECT_EQ(remote_client.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.
   DOMWindow* result =
       main_window->open("", "frame1", "", main_window, main_window);
   EXPECT_EQ(remote_client.LastRequest().Url(), WebURL(destination));
-  EXPECT_EQ(result, remote_frame->ToImplBase()->GetFrame()->DomWindow());
+  EXPECT_EQ(result, WebFrame::ToCoreFrame(*remote_frame)->DomWindow());
 
   Reset();
 }
 
 class RemoteWindowCloseClient : public FrameTestHelpers::TestWebViewClient {
  public:
   RemoteWindowCloseClient() : closed_(false) {}
 
   void CloseWidgetSoon() override { closed_ = true; }
 
@@ skipping 12 matching lines @@
   FrameTestHelpers::TestWebRemoteFrameClient frame_client;
   WebRemoteFrameImpl* web_remote_frame = frame_client.GetFrame();
 
   WebView* view = WebView::Create(&view_client, kWebPageVisibilityStateVisible);
   view->SetMainFrame(web_remote_frame);
   view->MainFrame()->SetOpener(main_web_view.WebView()->MainFrame());
   web_remote_frame->SetReplicatedOrigin(
       WebSecurityOrigin::CreateFromString("http://127.0.0.1"));
 
   LocalFrame* local_frame = ToLocalFrame(
-      main_web_view.WebView()->MainFrame()->ToImplBase()->GetFrame());
+      WebFrame::ToCoreFrame(*main_web_view.WebView()->MainFrame()));
   RemoteFrame* remote_frame = web_remote_frame->GetFrame();
 
   // Attempt to close the window, which should fail as it isn't opened
   // by a script.
   remote_frame->DomWindow()->close(local_frame->GetDocument());
   EXPECT_FALSE(view_client.Closed());
 
   // Marking it as opened by a script should now allow it to be closed.
   remote_frame->GetPage()->SetOpenedByDOM();
   remote_frame->DomWindow()->close(local_frame->GetDocument());
@@ skipping 476 matching lines @@
   // Prepare a page with a remote main frame.
   FrameTestHelpers::TestWebViewClient view_client;
   FrameTestHelpers::TestWebRemoteFrameClient remote_client;
   WebView* view = WebView::Create(&view_client, kWebPageVisibilityStateVisible);
   view->SetMainFrame(remote_client.GetFrame());
   WebRemoteFrame* remote_root = view->MainFrame()->ToWebRemoteFrame();
   remote_root->SetReplicatedOrigin(SecurityOrigin::CreateUnique());
 
   // Check that ScopedPageSuspender properly triggers deferred loading for
   // the current Page.
-  Page* page = remote_root->ToImplBase()->GetFrame()->GetPage();
+  Page* page = WebFrame::ToCoreFrame(*remote_root)->GetPage();
   EXPECT_FALSE(page->Suspended());
   {
     ScopedPageSuspender suspender;
     EXPECT_TRUE(page->Suspended());
   }
   EXPECT_FALSE(page->Suspended());
 
   // Repeat this for a page with a local child frame, and ensure that the
   // child frame's loads are also suspended.
   WebLocalFrame* web_local_child =
@@ skipping 2043 matching lines @@
 
   // Failing the original child frame navigation and trying to render fallback
   // content shouldn't crash. It should return NoLoadInProgress. This is so the
   // caller won't attempt to replace the correctly empty frame with an error
   // page.
   EXPECT_EQ(WebLocalFrame::NoLoadInProgress,
             child->MaybeRenderFallbackContent(WebURLError()));
 }
 
 }  // namespace blink