Remove FrameViewBase as base class of RemoteFrameView.

third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm

 /*
  * Copyright (C) 2010, 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 219 matching lines @@
   // moment when its destructor has been called. We should probably de-couple
   // some
   // of the clean-up work in ScrollbarThemeMac::unregisterScrollbar() to avoid
   // this
   // issue.
   if (!scrollbar)
     return NSZeroPoint;
 
   ASSERT(scrollerImp == scrollbarPainterForScrollbar(*scrollbar));
 
-  return scrollbar->ConvertFromContainingFrameViewBase(
+  return scrollbar->ConvertFromContainingFrameView(
       blink::IntPoint(pointInContentArea));
 }
 
 - (void)scrollerImpPair:(id)scrollerImpPair
     setContentAreaNeedsDisplayInRect:(NSRect)rect {
   if (!_scrollableArea)
     return;
 
   if (!_scrollableArea->ScrollbarsCanBeActive())
     return;
@@ skipping 237 matching lines @@
 - (NSRect)convertRectFromBacking:(NSRect)aRect {
   return aRect;
 }
 
 - (NSPoint)mouseLocationInScrollerForScrollerImp:(id)scrollerImp {
   if (!_scrollbar)
     return NSZeroPoint;
 
   DCHECK_EQ(scrollerImp, scrollbarPainterForScrollbar(*_scrollbar));
 
-  return _scrollbar->ConvertFromContainingFrameViewBase(
+  return _scrollbar->ConvertFromContainingFrameView(
       _scrollbar->GetScrollableArea()->LastKnownMousePosition());
 }
 
 - (void)setUpAlphaAnimation:
             (RetainPtr<BlinkScrollbarPartAnimation>&)scrollbarPartAnimation
             scrollerPainter:(ScrollbarPainter)scrollerPainter
                        part:(blink::ScrollbarPart)part
              animateAlphaTo:(CGFloat)newAlpha
                    duration:(NSTimeInterval)duration {
   // If the user has scrolled the page, then the scrollbars must be animated
@@ skipping 565 matching lines @@
     content_area_scrolled_timer_scroll_delta_ = ScrollOffset();
   } else
     [scrollbar_painter_controller_.Get() contentAreaScrolled];
 }
 
 void ScrollAnimatorMac::SetVisibleScrollerThumbRect(
     const IntRect& scroller_thumb) {
   IntRect rect_in_view_coordinates = scroller_thumb;
   if (Scrollbar* vertical_scrollbar = scrollable_area_->VerticalScrollbar())
     rect_in_view_coordinates =
-        vertical_scrollbar->ConvertToContainingFrameViewBase(scroller_thumb);
+        vertical_scrollbar->ConvertToContainingFrameView(scroller_thumb);
 
   if (rect_in_view_coordinates == visible_scroller_thumb_rect_)
     return;
 
   visible_scroller_thumb_rect_ = rect_in_view_coordinates;
 }
 
 }  // namespace blink