Move plugins to be stored in HTMLPlugInElement.

third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp

Index: third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
diff --git a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
index f3ffb66d4f4d5798f051194cdd04b54c89a291cb..e123c5fe03c5ac80920dad2dc4eeda67432cdb17 100644
--- a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
+++ b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
@@ -149,11 +149,8 @@ static bool contentLayerSupportsDirectBackgroundComposition(
 static WebLayer* platformLayerForPlugin(LayoutObject& layoutObject) {
   if (!layoutObject.isEmbeddedObject())
     return nullptr;
-  FrameViewBase* frameViewBase =
-      toLayoutEmbeddedObject(layoutObject).frameViewBase();
-  if (!frameViewBase || !frameViewBase->isPluginView())
-    return nullptr;
-  return toPluginView(frameViewBase)->platformLayer();
+  PluginView* plugin = toLayoutEmbeddedObject(layoutObject).plugin();
+  return plugin ? plugin->platformLayer() : nullptr;
 }
 
 static inline bool isAcceleratedContents(LayoutObject& layoutObject) {