Merge 239675 "cc: Allow 'overflow: hidden' layers to be scrolled..."

cc/trees/layer_tree_host_impl_unittest.cc

Index: cc/trees/layer_tree_host_impl_unittest.cc
===================================================================
--- cc/trees/layer_tree_host_impl_unittest.cc	(revision 240986)
+++ cc/trees/layer_tree_host_impl_unittest.cc	(working copy)
@@ -751,7 +751,9 @@
       gfx::Point(), SCROLL_BACKWARD));
 }
 
-TEST_F(LayerTreeHostImplTest, ScrollWithUserUnscrollableLayers) {
+// The user-scrollability breaks for zoomed-in pages. So disable this.
+// http://crbug.com/322223
+TEST_F(LayerTreeHostImplTest, DISABLED_ScrollWithUserUnscrollableLayers) {
   LayerImpl* scroll_layer = SetupScrollAndContentsLayers(gfx::Size(200, 200));
   host_impl_->SetViewportSize(gfx::Size(100, 100));