Replace pinch scrollbars with regular scrollbars.

Source/web/tests/WebFrameTest.cpp

Index: Source/web/tests/WebFrameTest.cpp
diff --git a/Source/web/tests/WebFrameTest.cpp b/Source/web/tests/WebFrameTest.cpp
index 61f5e826a1e251ed92d4b2fe13f6a26e11150824..8bdacadc8d96bbdc1786767a2db00da5ffdb583a 100644
--- a/Source/web/tests/WebFrameTest.cpp
+++ b/Source/web/tests/WebFrameTest.cpp
@@ -2417,12 +2417,7 @@ TEST_P(ParameterizedWebFrameTest, CanOverrideScaleLimits)
     EXPECT_EQ(2.0f, webViewHelper.webViewImpl()->maximumPageScaleFactor());
 }
 
-// Android doesn't have scrollbars on the main FrameView
-#if OS(ANDROID)
-TEST_F(WebFrameTest, DISABLED_updateOverlayScrollbarLayers)
-#else
 TEST_F(WebFrameTest, updateOverlayScrollbarLayers)
-#endif
 {
     UseMockScrollbarSettings mockScrollbarSettings;
 
@@ -2441,11 +2436,6 @@ TEST_F(WebFrameTest, updateOverlayScrollbarLayers)
     FrameView* view = webViewHelper.webViewImpl()->mainFrameImpl()->frameView();
     EXPECT_TRUE(view->layoutView()->compositor()->layerForHorizontalScrollbar());
     EXPECT_TRUE(view->layoutView()->compositor()->layerForVerticalScrollbar());
-
-    webViewHelper.webView()->resize(WebSize(viewWidth * 10, viewHeight * 10));
-    webViewHelper.webView()->layout();
-    EXPECT_FALSE(view->layoutView()->compositor()->layerForHorizontalScrollbar());
-    EXPECT_FALSE(view->layoutView()->compositor()->layerForVerticalScrollbar());
 }
 
 void setScaleAndScrollAndLayout(WebViewImpl* webView, WebPoint scroll, float scale)