Move plugins to be stored in HTMLPlugInElement.

third_party/WebKit/Source/core/html/HTMLPlugInElement.h

Index: third_party/WebKit/Source/core/html/HTMLPlugInElement.h
diff --git a/third_party/WebKit/Source/core/html/HTMLPlugInElement.h b/third_party/WebKit/Source/core/html/HTMLPlugInElement.h
index 7840ace642fded995f3f75cb31762f6a471f0fb6..e6c6fe100f08f0965a28a370331630d2ce0f9b6c 100644
--- a/third_party/WebKit/Source/core/html/HTMLPlugInElement.h
+++ b/third_party/WebKit/Source/core/html/HTMLPlugInElement.h
@@ -50,7 +50,10 @@ class CORE_EXPORT HTMLPlugInElement : public HTMLFrameOwnerElement {
   // TODO(dcheng): Consider removing this, since HTMLEmbedElementLegacyCall
   // and HTMLObjectElementLegacyCall usage is extremely low.
   SharedPersistent<v8::Object>* pluginWrapper();
-  FrameViewBase* pluginWidget() const;
+  // TODO(joelhockey): Can we remove pluginWidget and just have plugin?
+  // The implementation of pluginWidget calls layoutPartForJSBindings.
+  PluginView* pluginWidget() const;
+  PluginView* plugin() const;
   bool canProcessDrag() const;
   const String& url() const { return m_url; }
 
@@ -159,7 +162,6 @@ class CORE_EXPORT HTMLPlugInElement : public HTMLFrameOwnerElement {
 
   void setPlugin(PluginView*);
   PluginView* releasePlugin();
-  PluginView* ownedPlugin() const;
   void setPersistedPlugin(PluginView*);
 
   bool requestObjectInternal(const String& url,
@@ -175,6 +177,7 @@ class CORE_EXPORT HTMLPlugInElement : public HTMLFrameOwnerElement {
   // avoid accessing |layoutObject()| in layoutObjectIsFocusable().
   bool m_pluginIsAvailable = false;
 
+  Member<PluginView> m_plugin;
   // Normally the plugin is stored in HTMLFrameOwnerElement::m_widget.
   // However, plugins can persist even when not rendered. In order to
   // prevent confusing code which may assume that ownedWidget() != null