Move plugins to be stored in HTMLPlugInElement.

third_party/WebKit/Source/web/WebViewImpl.cpp

Index: third_party/WebKit/Source/web/WebViewImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebViewImpl.cpp b/third_party/WebKit/Source/web/WebViewImpl.cpp
index 073fd94702d908912e0ea6bccc215fb88555156e..607a1889caee3e853e18e5fbb15c85ff92660819 100644
--- a/third_party/WebKit/Source/web/WebViewImpl.cpp
+++ b/third_party/WebKit/Source/web/WebViewImpl.cpp
@@ -1144,11 +1144,11 @@ WebInputEventResult WebViewImpl::handleKeyEvent(const WebKeyboardEvent& event) {
         if (event.windowsKeyCode == VKEY_TAB) {
           // If the plugin supports keyboard focus then we should not send a tab
           // keypress event.
-          FrameViewBase* frameViewBase =
-              toLayoutPart(element->layoutObject())->frameViewBase();
-          if (frameViewBase && frameViewBase->isPluginContainer()) {
+          PluginView* pluginView =
+              toLayoutPart(element->layoutObject())->plugin();
+          if (pluginView && pluginView->isPluginContainer()) {
             WebPluginContainerImpl* plugin =
-                toWebPluginContainerImpl(frameViewBase);
+                toWebPluginContainerImpl(pluginView);
             if (plugin && plugin->supportsKeyboardFocus())
               m_suppressNextKeypressEvent = true;
           }
@@ -3332,10 +3332,9 @@ void WebViewImpl::performPluginAction(const WebPluginAction& action,
 
   LayoutObject* object = node->layoutObject();
   if (object && object->isLayoutPart()) {
-    FrameViewBase* frameViewWidget = toLayoutPart(object)->frameViewBase();
-    if (frameViewWidget && frameViewWidget->isPluginContainer()) {
-      WebPluginContainerImpl* plugin =
-          toWebPluginContainerImpl(frameViewWidget);
+    PluginView* pluginView = toLayoutPart(object)->plugin();
+    if (pluginView && pluginView->isPluginContainer()) {
+      WebPluginContainerImpl* plugin = toWebPluginContainerImpl(pluginView);
       switch (action.type) {
         case WebPluginAction::Rotate90Clockwise:
           plugin->plugin()->rotateView(WebPlugin::RotationType90Clockwise);