Replace pinch scrollbars with regular scrollbars.

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 2399 matching lines @@
     EXPECT_EQ(1.0f, webViewHelper.webViewImpl()->minimumPageScaleFactor());
     EXPECT_EQ(5.0f, webViewHelper.webViewImpl()->maximumPageScaleFactor());
 
     webViewHelper.webView()->setIgnoreViewportTagScaleLimits(false);
     webViewHelper.webView()->layout();
 
     EXPECT_EQ(2.0f, webViewHelper.webViewImpl()->minimumPageScaleFactor());
     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;
 
     registerMockedHttpURLLoad("large-div.html");
 
     int viewWidth = 500;
     int viewHeight = 500;
 
     OwnPtr<FakeCompositingWebViewClient> fakeCompositingWebViewClient = adoptPtr(new FakeCompositingWebViewClient());
     FrameTestHelpers::WebViewHelper webViewHelper;
     webViewHelper.initialize(true, 0, fakeCompositingWebViewClient.get(), &configueCompositingWebView);
 
     webViewHelper.webView()->resize(WebSize(viewWidth, viewHeight));
     FrameTestHelpers::loadFrame(webViewHelper.webView()->mainFrame(), m_baseURL + "large-div.html");
 
     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)
 {
     webView->setPageScaleFactor(scale);
     webView->mainFrame()->setScrollOffset(WebSize(scroll.x, scroll.y));
     webView->layout();
 }
 
 void simulatePageScale(WebViewImpl* webViewImpl, float& scale)
@@ skipping 5576 matching lines @@
 
 TEST_F(WebFrameTest, MaxFramesDetach)
 {
     registerMockedHttpURLLoad("max-frames-detach.html");
     FrameTestHelpers::WebViewHelper webViewHelper;
     WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "max-frames-detach.html", true);
     webViewImpl->mainFrameImpl()->collectGarbage();
 }
 
 } // namespace blink