Move plugins to be stored in HTMLPlugInElement.

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

Index: third_party/WebKit/Source/core/html/PluginDocument.cpp
diff --git a/third_party/WebKit/Source/core/html/PluginDocument.cpp b/third_party/WebKit/Source/core/html/PluginDocument.cpp
index 9c4c34c201d0ce0adc1d99d70817ebed1f7f3f77..c2445be8c5f6d5dc034fade5682aee8de5b6cc28 100644
--- a/third_party/WebKit/Source/core/html/PluginDocument.cpp
+++ b/third_party/WebKit/Source/core/html/PluginDocument.cpp
@@ -34,6 +34,7 @@
 #include "core/html/HTMLBodyElement.h"
 #include "core/html/HTMLEmbedElement.h"
 #include "core/html/HTMLHtmlElement.h"
+#include "core/html/HTMLPlugInElement.h"
 #include "core/layout/LayoutEmbeddedObject.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/loader/FrameLoader.h"
@@ -175,15 +176,9 @@ DocumentParser* PluginDocument::createParser() {
 }
 
 PluginView* PluginDocument::pluginView() {
-  if (m_pluginNode && m_pluginNode->layoutObject()) {
-    CHECK(m_pluginNode->layoutObject()->isEmbeddedObject());
-    FrameViewBase* frameViewBase =
-        toLayoutEmbeddedObject(m_pluginNode->layoutObject())->frameViewBase();
-    if (!frameViewBase || !frameViewBase->isPluginContainer())
-      return nullptr;
-    return toPluginView(frameViewBase);
-  }
-  return 0;
+  return m_pluginNode && isHTMLPlugInElement(m_pluginNode)
+             ? toHTMLPlugInElement(m_pluginNode)->plugin()
+             : nullptr;
 }
 
 Node* PluginDocument::pluginNode() {