Revert of [RootLayerScrolls] Fix ScrollingCoordinatorTest

third_party/WebKit/Source/web/tests/WebFrameTest.cpp

Index: third_party/WebKit/Source/web/tests/WebFrameTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
index bc04711adada3b2d8e4d839052020552031e1c95..d123a03ceffb17247de312433aaba890b5e7b4b9 100644
--- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
@@ -7761,16 +7761,6 @@
   webViewHelper.resize(WebSize(viewportWidth, viewportHeight));
   webViewImpl->updateAllLifecyclePhases();
 
-  WebLayer* webScrollLayer = webViewImpl->mainFrameImpl()
-                                 ->frame()
-                                 ->view()
-                                 ->layoutViewportScrollableArea()
-                                 ->layerForScrolling()
-                                 ->platformLayer();
-  ASSERT_TRUE(webScrollLayer->scrollable());
-  ASSERT_TRUE(webScrollLayer->userScrollableHorizontal());
-  ASSERT_TRUE(webScrollLayer->userScrollableVertical());
-
   Document* document = webViewImpl->mainFrameImpl()->frame()->document();
   UserGestureIndicator gesture(DocumentUserGestureToken::create(document));
   Fullscreen::requestFullscreen(*document->documentElement());
@@ -7790,12 +7780,8 @@
             Fullscreen::fullscreenElementFrom(*document));
 
   // Verify that the main frame is still scrollable.
-  webScrollLayer = webViewImpl->mainFrameImpl()
-                       ->frame()
-                       ->view()
-                       ->layoutViewportScrollableArea()
-                       ->layerForScrolling()
-                       ->platformLayer();
+  WebLayer* webScrollLayer =
+      webViewImpl->compositor()->scrollLayer()->platformLayer();
   ASSERT_TRUE(webScrollLayer->scrollable());
   ASSERT_TRUE(webScrollLayer->userScrollableHorizontal());
   ASSERT_TRUE(webScrollLayer->userScrollableVertical());