Move plugins to be stored in HTMLPlugInElement.

third_party/WebKit/Source/core/paint/PartPainter.cpp

Index: third_party/WebKit/Source/core/paint/PartPainter.cpp
diff --git a/third_party/WebKit/Source/core/paint/PartPainter.cpp b/third_party/WebKit/Source/core/paint/PartPainter.cpp
index 15736e971c50a412b603685a60486dde7eba23f7..6536f6e19458d5a7b0560212f4986e7d4fc8e6f2 100644
--- a/third_party/WebKit/Source/core/paint/PartPainter.cpp
+++ b/third_party/WebKit/Source/core/paint/PartPainter.cpp
@@ -69,7 +69,7 @@ void PartPainter::paint(const PaintInfo& paintInfo,
   if (paintInfo.phase != PaintPhaseForeground)
     return;
 
-  if (m_layoutPart.frameViewBase()) {
+  if (m_layoutPart.pluginOrFrame()) {
     // TODO(schenney) crbug.com/93805 Speculative release assert to verify that
     // the crashes we see in FrameViewBase painting are due to a destroyed
     // LayoutPart object.
@@ -118,7 +118,7 @@ void PartPainter::paintContents(const PaintInfo& paintInfo,
                                 const LayoutPoint& paintOffset) {
   LayoutPoint adjustedPaintOffset = paintOffset + m_layoutPart.location();
 
-  FrameViewBase* frameViewBase = m_layoutPart.frameViewBase();
+  FrameViewBase* frameViewBase = m_layoutPart.pluginOrFrame();
   CHECK(frameViewBase);
 
   IntPoint paintLocation(roundedIntPoint(