Rename FrameViewBase fields and methods *Widget* to ...FrameViewBase...

third_party/WebKit/Source/platform/scroll/Scrollbar.cpp

Index: third_party/WebKit/Source/platform/scroll/Scrollbar.cpp
diff --git a/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp b/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp
index b3ec4ef7f59e2711cc1196b117e3aab057cb57c6..5f01f0ca53e346fbe7d8c63a591e83c4283df349 100644
--- a/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp
+++ b/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp
@@ -570,39 +570,40 @@ bool Scrollbar::isWindowActive() const {
   return m_scrollableArea && m_scrollableArea->isActive();
 }
 
-IntRect Scrollbar::convertToContainingWidget(const IntRect& localRect) const {
+IntRect Scrollbar::convertToContainingFrameViewBase(
+    const IntRect& localRect) const {
   if (m_scrollableArea)
     return m_scrollableArea->convertFromScrollbarToContainingWidget(*this,
                                                                     localRect);
 
-  return FrameViewBase::convertToContainingWidget(localRect);
+  return FrameViewBase::convertToContainingFrameViewBase(localRect);
 }
 
-IntRect Scrollbar::convertFromContainingWidget(
+IntRect Scrollbar::convertFromContainingFrameViewBase(
     const IntRect& parentRect) const {
   if (m_scrollableArea)
     return m_scrollableArea->convertFromContainingWidgetToScrollbar(*this,
                                                                     parentRect);
 
-  return FrameViewBase::convertFromContainingWidget(parentRect);
+  return FrameViewBase::convertFromContainingFrameViewBase(parentRect);
 }
 
-IntPoint Scrollbar::convertToContainingWidget(
+IntPoint Scrollbar::convertToContainingFrameViewBase(
     const IntPoint& localPoint) const {
   if (m_scrollableArea)
     return m_scrollableArea->convertFromScrollbarToContainingWidget(*this,
                                                                     localPoint);
 
-  return FrameViewBase::convertToContainingWidget(localPoint);
+  return FrameViewBase::convertToContainingFrameViewBase(localPoint);
 }
 
-IntPoint Scrollbar::convertFromContainingWidget(
+IntPoint Scrollbar::convertFromContainingFrameViewBase(
     const IntPoint& parentPoint) const {
   if (m_scrollableArea)
     return m_scrollableArea->convertFromContainingWidgetToScrollbar(
         *this, parentPoint);
 
-  return FrameViewBase::convertFromContainingWidget(parentPoint);
+  return FrameViewBase::convertFromContainingFrameViewBase(parentPoint);
 }
 
 float Scrollbar::scrollableAreaCurrentPos() const {