Move plugins to be stored in HTMLPlugInElement.

third_party/WebKit/Source/core/dom/Document.cpp

Index: third_party/WebKit/Source/core/dom/Document.cpp
diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp
index a1481a308f4261799da7bd1290155e90156eb33d..c3fa87c6e75731f9bf88adb8097e764d18bc4244 100644
--- a/third_party/WebKit/Source/core/dom/Document.cpp
+++ b/third_party/WebKit/Source/core/dom/Document.cpp
@@ -164,6 +164,7 @@
 #include "core/html/HTMLInputElement.h"
 #include "core/html/HTMLLinkElement.h"
 #include "core/html/HTMLMetaElement.h"
+#include "core/html/HTMLPlugInElement.h"
 #include "core/html/HTMLScriptElement.h"
 #include "core/html/HTMLTemplateElement.h"
 #include "core/html/HTMLTitleElement.h"
@@ -368,6 +369,13 @@ static inline bool isValidNamePart(UChar32 c) {
 }
 
 static FrameViewBase* frameViewBaseForElement(const Element& focusedElement) {
+  // Return either plugin or frame.
+  // TODO(joelhockey): FrameViewBase class will soon be removed.  It will be
+  // replaced with Focusable ABC that FrameView and PluginView will implement
+  // and this method will return Focusable.
+  if (isHTMLPlugInElement(focusedElement))
+    return toHTMLPlugInElement(focusedElement).plugin();
+
   LayoutObject* layoutObject = focusedElement.layoutObject();
   if (!layoutObject || !layoutObject->isLayoutPart())
     return 0;