Remove FrameViewBase as base class of PluginView.

third_party/WebKit/Source/core/layout/LayoutPart.h

Index: third_party/WebKit/Source/core/layout/LayoutPart.h
diff --git a/third_party/WebKit/Source/core/layout/LayoutPart.h b/third_party/WebKit/Source/core/layout/LayoutPart.h
index a1577ce4da93bd9cad4c391284e2797a97f7e311..b71b33f19b18869ef871eedfa8db4a1fe928e675 100644
--- a/third_party/WebKit/Source/core/layout/LayoutPart.h
+++ b/third_party/WebKit/Source/core/layout/LayoutPart.h
@@ -25,11 +25,13 @@
 
 #include "core/CoreExport.h"
 #include "core/layout/LayoutReplaced.h"
-#include "core/plugins/PluginView.h"
-#include "platform/FrameViewBase.h"
 
 namespace blink {
 
+class FrameOrPlugin;
+class FrameViewBase;
+class PluginView;
+
 // LayoutObject for frames via LayoutFrame and LayoutIFrame, and plugins via
 // LayoutEmbeddedObject.
 class CORE_EXPORT LayoutPart : public LayoutReplaced {
@@ -51,11 +53,7 @@ class CORE_EXPORT LayoutPart : public LayoutReplaced {
 
   FrameViewBase* GetFrameViewBase() const;
   PluginView* Plugin() const;
-  // TODO(joelhockey): This method will be removed once FrameViewBase
-  // class is removed.  New abstract base classes will be defined
-  // for when polymorphism is required for plugins and frames and
-  // other methods provided.
-  FrameViewBase* PluginOrFrame() const;
+  FrameOrPlugin* GetFrameOrPlugin() const;
 
   LayoutRect ReplacedContentRect() const final;
 
@@ -80,7 +78,7 @@ class CORE_EXPORT LayoutPart : public LayoutReplaced {
       const PaintInvalidationState&) override;
 
  private:
-  void UpdateGeometryInternal(FrameViewBase&);
+  void UpdateGeometryInternal(FrameOrPlugin&);
   CompositingReasons AdditionalCompositingReasons() const override;
 
   void WillBeDestroyed() final;