Revert of [RootLayerScrolls] Fix ScrollingCoordinatorTest

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

 /*
  * Copyright (C) 2010 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 7743 matching lines @@
   registerMockedHttpURLLoad("fullscreen_div.html");
   FrameTestHelpers::WebViewHelper webViewHelper;
   int viewportWidth = 640;
   int viewportHeight = 480;
   WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(
       m_baseURL + "fullscreen_div.html", true, nullptr, &client, nullptr,
       configureAndroid);
   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());
   EXPECT_EQ(nullptr, Fullscreen::currentFullScreenElementFrom(*document));
   EXPECT_EQ(document->documentElement(),
             Fullscreen::fullscreenElementFrom(*document));
   webViewImpl->didEnterFullscreen();
   EXPECT_EQ(document->documentElement(),
             Fullscreen::currentFullScreenElementFrom(*document));
   EXPECT_EQ(document->documentElement(),
             Fullscreen::fullscreenElementFrom(*document));
 
   webViewImpl->updateAllLifecyclePhases();
   EXPECT_EQ(document->documentElement(),
             Fullscreen::currentFullScreenElementFrom(*document));
   EXPECT_EQ(document->documentElement(),
             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());
 
   // Verify the main frame still behaves correctly after a resize.
   webViewHelper.resize(WebSize(viewportHeight, viewportWidth));
   ASSERT_TRUE(webScrollLayer->scrollable());
   ASSERT_TRUE(webScrollLayer->userScrollableHorizontal());
   ASSERT_TRUE(webScrollLayer->userScrollableVertical());
 }
@@ skipping 3462 matching lines @@
 
   EXPECT_TRUE(mainFrameClient.childClient().didCallFrameDetached());
   EXPECT_TRUE(mainFrameClient.childClient().didCallDidStopLoading());
   EXPECT_TRUE(mainFrameClient.childClient().didCallDidFinishDocumentLoad());
   EXPECT_TRUE(mainFrameClient.childClient().didCallDidHandleOnloadEvents());
 
   webViewHelper.reset();
 }
 
 }  // namespace blink