Remove FrameViewBase as base class of RemoteFrameView.

third_party/WebKit/Source/platform/FrameViewBase.h

Index: third_party/WebKit/Source/platform/FrameViewBase.h
diff --git a/third_party/WebKit/Source/platform/FrameViewBase.h b/third_party/WebKit/Source/platform/FrameViewBase.h
index ab3d186f8bacf77d4b8fd90908f021f21a8023f8..5a9f73ee0da4c7ce378ff419260dd7f539c8def2 100644
--- a/third_party/WebKit/Source/platform/FrameViewBase.h
+++ b/third_party/WebKit/Source/platform/FrameViewBase.h
@@ -46,16 +46,9 @@ class PLATFORM_EXPORT FrameViewBase : public GarbageCollectedMixin {
   virtual IntPoint Location() const = 0;
 
   virtual bool IsFrameView() const { return false; }
-  virtual bool IsRemoteFrameView() const { return false; }
 
-  virtual void SetParent(FrameViewBase*) = 0;

[joelhockey, 2017/05/01 23:04:35]

SetParent, SetParentVisible, FrameRectsChanged methods moved to FrameOrPlugin
interface.

   virtual FrameViewBase* Parent() const = 0;
 
-  // TODO(joelhockey): Remove this from FrameViewBase once FrameView children
-  // use FrameOrPlugin rather than FrameViewBase.  This method does not apply to
-  // scrollbars.
-  virtual void SetParentVisible(bool visible) {}
-
   // ConvertFromRootFrame must be in FrameViewBase rather than FrameView
   // to be visible to Scrollbar::ConvertFromRootFrame and
   // RemoteFrameView::UpdateRemoteViewportIntersection. The related
@@ -64,7 +57,7 @@ class PLATFORM_EXPORT FrameViewBase : public GarbageCollectedMixin {
     if (const FrameViewBase* parent_frame_view_base = Parent()) {
       IntRect parent_rect =
           parent_frame_view_base->ConvertFromRootFrame(rect_in_root_frame);
-      return ConvertFromContainingFrameViewBase(parent_rect);
+      return ConvertFromContainingFrameView(parent_rect);
     }
     return rect_in_root_frame;
   }
@@ -73,7 +66,7 @@ class PLATFORM_EXPORT FrameViewBase : public GarbageCollectedMixin {
     if (const FrameViewBase* parent_frame_view_base = Parent()) {
       IntPoint parent_point =
           parent_frame_view_base->ConvertFromRootFrame(point_in_root_frame);
-      return ConvertFromContainingFrameViewBase(parent_point);
+      return ConvertFromContainingFrameView(parent_point);
     }
     return point_in_root_frame;
   }
@@ -99,20 +92,8 @@ class PLATFORM_EXPORT FrameViewBase : public GarbageCollectedMixin {
     return parent_point;
   }
 
-  // TODO(joelhockey): Change all these to pure virtual functions
-  // Once RemoteFrameView no longer inherits from FrameViewBase.
-  virtual IntRect ConvertFromContainingFrameViewBase(
-      const IntRect& parent_rect) const {
-    NOTREACHED();
-    return parent_rect;
-  }
-  virtual IntPoint ConvertFromContainingFrameViewBase(
-      const IntPoint& parent_point) const {
-    NOTREACHED();
-    return parent_point;
-  }
-
-  virtual void FrameRectsChanged() { NOTREACHED(); }
+  virtual IntRect ConvertFromContainingFrameView(const IntRect&) const = 0;
+  virtual IntPoint ConvertFromContainingFrameView(const IntPoint&) const = 0;
 
   virtual void Dispose() {}
 };