Remove most of Widget (FrameViewBase) class from HTMLPlugInElement.

third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp

 /*
  * Copyright (C) 2006, 2007, 2009 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 270 matching lines @@
     if (AXObjectCache* cache = document().existingAXObjectCache())
       cache->childrenChanged(layoutPart);
   }
   return m_widget.release();
 }
 
 FrameViewBase* HTMLFrameOwnerElement::ownedWidget() const {
   return m_widget.get();
 }
 
+void HTMLFrameOwnerElement::setPlugin(PluginView* pluginView) {
+  this->setWidget(pluginView);
+}
+
+PluginView* HTMLFrameOwnerElement::releasePlugin() {
+  DCHECK(!m_widget || m_widget->isPluginView());

[haraken, 2017/03/20 03:06:35]

I'd use CHECK until we completely remove FrameViewBase (to catch some unexpected
programming error).

[joelhockey, 2017/03/20 03:54:29]

I have changed to use toPluginViewOrDie which does the CHECK.

I have moved these 3 methods to HTMLPlugInElement.

+  return toPluginView(this->releaseWidget());
+}
+
+PluginView* HTMLFrameOwnerElement::ownedPlugin() const {
+  DCHECK(!m_widget || m_widget->isPluginView());

[haraken, 2017/03/20 03:06:35]

Ditto.

[joelhockey, 2017/03/20 03:54:29]

Done

+  return toPluginView(this->ownedWidget());
+}
+
 bool HTMLFrameOwnerElement::loadOrRedirectSubframe(
     const KURL& url,
     const AtomicString& frameName,
     bool replaceCurrentItem) {
   LocalFrame* parentFrame = document().frame();
   if (contentFrame()) {
     contentFrame()->navigate(document(), url, replaceCurrentItem,
                              UserGestureStatus::None);
     return true;
   }
@@ skipping 23 matching lines @@
 }
 
 DEFINE_TRACE(HTMLFrameOwnerElement) {
   visitor->trace(m_contentFrame);
   visitor->trace(m_widget);
   HTMLElement::trace(visitor);
   FrameOwner::trace(visitor);
 }
 
 }  // namespace blink