Revert of Account for overlay scrollbars when computing scrollbar width/height.

third_party/WebKit/Source/core/paint/PaintLayerScrollableAreaTest.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/paint/PaintLayerScrollableArea.h"
 
 #include "core/frame/FrameView.h"
 #include "core/layout/LayoutBoxModelObject.h"
 #include "core/layout/LayoutTestHelper.h"
 #include "core/paint/PaintLayer.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/scroll/ScrollTypes.h"
-#include "platform/scroll/ScrollbarTheme.h"
 #include "platform/testing/RuntimeEnabledFeaturesTestHelpers.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using testing::_;
 
 namespace blink {
 namespace {
 
 class MockChromeClient : public EmptyChromeClient {
  public:
@@ skipping 518 matching lines @@
   EXPECT_CALL(chromeClient(), mockSetToolTip(document().frame(), String(), _))
       .Times(1);
   scrollableArea->setScrollOffset(ScrollOffset(1, 1), UserScroll);
 
   // Programmatic scrolling should not dismiss the tooltip, so setToolTip
   // should not be called for this invocation.
   EXPECT_CALL(chromeClient(), mockSetToolTip(document().frame(), String(), _))
       .Times(0);
   scrollableArea->setScrollOffset(ScrollOffset(2, 2), ProgrammaticScroll);
 }
-
-TEST_F(PaintLayerScrollableAreaTest, IncludeOverlayScrollbarsInVisibleWidth) {
-  RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(false);
-  setBodyInnerHTML(
-      "<style>"
-      "#scroller { overflow: overlay; height: 100px; width: 100px; }"
-      "#scrolled { width: 100px; height: 200px; }"
-      "</style>"
-      "<div id=\"scroller\"><div id=\"scrolled\"></div></div>");
-  document().view()->updateAllLifecyclePhases();
-  Element* scroller = document().getElementById("scroller");
-  ASSERT_TRUE(scroller);
-  PaintLayerScrollableArea* scrollableArea =
-      toLayoutBoxModelObject(scroller->layoutObject())->getScrollableArea();
-  ASSERT_TRUE(scrollableArea);
-  scrollableArea->setScrollOffset(ScrollOffset(100, 0), ClampingScroll);
-  EXPECT_EQ(scrollableArea->getScrollOffset().width(), 0);
 }
-}