Update WebLocalFrameImpl with WebLocalFrameBase to break dependencies.

third_party/WebKit/Source/web/WebViewImpl.cpp

Index: third_party/WebKit/Source/web/WebViewImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebViewImpl.cpp b/third_party/WebKit/Source/web/WebViewImpl.cpp
index 6496744c596bb2088bdb063cbfe72955a15e45f5..76ced057fd982bb2b9b1c9d77a91cad6f5414693 100644
--- a/third_party/WebKit/Source/web/WebViewImpl.cpp
+++ b/third_party/WebKit/Source/web/WebViewImpl.cpp
@@ -64,6 +64,7 @@
 #include "core/frame/Settings.h"
 #include "core/frame/UseCounter.h"
 #include "core/frame/VisualViewport.h"
+#include "core/frame/WebLocalFrameBase.h"
 #include "core/html/HTMLMediaElement.h"
 #include "core/html/HTMLPlugInElement.h"
 #include "core/html/HTMLTextAreaElement.h"
@@ -170,7 +171,6 @@
 #include "web/StorageQuotaClientImpl.h"
 #include "web/WebDevToolsAgentImpl.h"
 #include "web/WebInputMethodControllerImpl.h"
-#include "web/WebLocalFrameImpl.h"
 #include "web/WebRemoteFrameImpl.h"
 #include "web/WebSettingsImpl.h"
 
@@ -428,13 +428,13 @@ WebViewImpl::~WebViewImpl() {
 }
 
 WebDevToolsAgentImpl* WebViewImpl::MainFrameDevToolsAgentImpl() {
-  WebLocalFrameImpl* main_frame = MainFrameImpl();
+  WebLocalFrameBase* main_frame = MainFrameImpl();
   return main_frame ? main_frame->DevToolsAgentImpl() : nullptr;
 }
 
-WebLocalFrameImpl* WebViewImpl::MainFrameImpl() const {
+WebLocalFrameBase* WebViewImpl::MainFrameImpl() const {
   return page_ && page_->MainFrame() && page_->MainFrame()->IsLocalFrame()
-             ? WebLocalFrameImpl::FromFrame(page_->DeprecatedLocalMainFrame())
+             ? WebLocalFrameBase::FromFrame(page_->DeprecatedLocalMainFrame())
              : nullptr;
 }
 
@@ -1701,7 +1701,7 @@ PagePopup* WebViewImpl::OpenPagePopup(PagePopupClient* client) {
     page_popup_->ClosePopup();
     page_popup_ = nullptr;
   }
-  EnablePopupMouseWheelEventListener(WebLocalFrameImpl::FromFrame(
+  EnablePopupMouseWheelEventListener(WebLocalFrameBase::FromFrame(
       client->OwnerElement().GetDocument().GetFrame()->LocalFrameRoot()));
   return page_popup_.Get();
 }
@@ -1726,7 +1726,7 @@ void WebViewImpl::CancelPagePopup() {
 }
 
 void WebViewImpl::EnablePopupMouseWheelEventListener(
-    WebLocalFrameImpl* local_root) {
+    WebLocalFrameBase* local_root) {
   DCHECK(!popup_mouse_wheel_event_listener_);
   Document* document = local_root->GetDocument();
   DCHECK(document);
@@ -1855,7 +1855,7 @@ void WebViewImpl::DidUpdateBrowserControls() {
         GetBrowserControls().Height(), GetBrowserControls().ShrinkViewport());
   }
 
-  WebLocalFrameImpl* main_frame = MainFrameImpl();
+  WebLocalFrameBase* main_frame = MainFrameImpl();
   if (!main_frame)
     return;
 
@@ -1936,7 +1936,7 @@ void WebViewImpl::ResizeWithBrowserControls(
     return;
   }
 
-  WebLocalFrameImpl* main_frame = MainFrameImpl();
+  WebLocalFrameBase* main_frame = MainFrameImpl();
   if (!main_frame)
     return;
 
@@ -2048,7 +2048,7 @@ void WebViewImpl::UpdateAllLifecyclePhases() {
   if (FrameView* view = MainFrameImpl()->GetFrameView()) {
     LocalFrame* frame = MainFrameImpl()->GetFrame();
     WebWidgetClient* client =
-        WebLocalFrameImpl::FromFrame(frame)->FrameWidget()->Client();
+        WebLocalFrameBase::FromFrame(frame)->FrameWidget()->Client();
 
     if (should_dispatch_first_visually_non_empty_layout_ &&
         view->IsVisuallyNonEmpty()) {
@@ -2639,11 +2639,11 @@ WebFrame* WebViewImpl::FindFrameByName(const WebString& name,
   // to WebFrame.
   if (!relative_to_frame)
     relative_to_frame = MainFrame();
-  Frame* frame = ToWebLocalFrameImpl(relative_to_frame)->GetFrame();
+  Frame* frame = ToWebLocalFrameBase(relative_to_frame)->GetFrame();
   frame = frame->Tree().Find(name);
   if (!frame || !frame->IsLocalFrame())
     return nullptr;
-  return WebLocalFrameImpl::FromFrame(ToLocalFrame(frame));
+  return WebLocalFrameBase::FromFrame(ToLocalFrame(frame));
 }
 
 WebLocalFrame* WebViewImpl::FocusedFrame() {
@@ -2653,7 +2653,7 @@ WebLocalFrame* WebViewImpl::FocusedFrame() {
   // See crbug.com/625068
   if (!frame || !frame->IsLocalFrame())
     return nullptr;
-  return WebLocalFrameImpl::FromFrame(ToLocalFrame(frame));
+  return WebLocalFrameBase::FromFrame(ToLocalFrame(frame));
 }
 
 void WebViewImpl::SetFocusedFrame(WebFrame* frame) {
@@ -2664,7 +2664,7 @@ void WebViewImpl::SetFocusedFrame(WebFrame* frame) {
       ToLocalFrame(focused_frame)->Selection().SetFrameIsFocused(false);
     return;
   }
-  LocalFrame* core_frame = ToWebLocalFrameImpl(frame)->GetFrame();
+  LocalFrame* core_frame = ToWebLocalFrameBase(frame)->GetFrame();
   core_frame->GetPage()->GetFocusController().SetFocusedFrame(core_frame);
 }
 
@@ -2887,7 +2887,7 @@ void WebViewImpl::AdvanceFocusAcrossFrames(WebFocusType type,
   // TODO(alexmos): Pass in proper with sourceCapabilities.
   GetPage()->GetFocusController().AdvanceFocusAcrossFrames(
       type, ToWebRemoteFrameImpl(from)->GetFrame(),
-      ToWebLocalFrameImpl(to)->GetFrame());
+      ToWebLocalFrameBase(to)->GetFrame());
 }
 
 double WebViewImpl::ZoomLevel() {
@@ -3637,7 +3637,7 @@ void WebViewImpl::DidCommitLoad(bool is_new_navigation,
   EndActiveFlingAnimation();
 }
 
-void WebViewImpl::ResizeAfterLayout(WebLocalFrameImpl* webframe) {
+void WebViewImpl::ResizeAfterLayout(WebLocalFrameBase* webframe) {
   LocalFrame* frame = webframe->GetFrame();
   if (!client_ || !client_->CanUpdateLayout() || !frame->IsMainFrame())
     return;
@@ -3662,7 +3662,7 @@ void WebViewImpl::ResizeAfterLayout(WebLocalFrameImpl* webframe) {
   resize_viewport_anchor_->ResizeFrameView(MainFrameSize());
 }
 
-void WebViewImpl::LayoutUpdated(WebLocalFrameImpl* webframe) {
+void WebViewImpl::LayoutUpdated(WebLocalFrameBase* webframe) {
   LocalFrame* frame = webframe->GetFrame();
   if (!client_ || !frame->IsMainFrame())
     return;
@@ -3918,7 +3918,7 @@ void WebViewImpl::InvalidateRect(const IntRect& rect) {
 }
 
 PaintLayerCompositor* WebViewImpl::Compositor() const {
-  WebLocalFrameImpl* frame = MainFrameImpl();
+  WebLocalFrameBase* frame = MainFrameImpl();
   if (!frame)
     return nullptr;