Ignore should-scroll-on-main-thread if main frame is not scrollable

cc/layers/scrollbar_layer_unittest.cc

Index: cc/layers/scrollbar_layer_unittest.cc
diff --git a/cc/layers/scrollbar_layer_unittest.cc b/cc/layers/scrollbar_layer_unittest.cc
index 0c160c400d9b1fdc72de719fe598db04d5c51ef0..bfcb39b9a1559deef56ed07ca4d54f1dec979ce2 100644
--- a/cc/layers/scrollbar_layer_unittest.cc
+++ b/cc/layers/scrollbar_layer_unittest.cc
@@ -85,7 +85,8 @@ TEST(ScrollbarLayerTest, ShouldScrollNonOverlayOnMainThread) {
   // scrollbar scrolling.
   EXPECT_EQ(InputHandler::ScrollOnMainThread,
             scrollbar_layer_impl->TryScroll(gfx::Point(0, 0),
-                                            InputHandler::Gesture));
+                                            InputHandler::Gesture,
+                                            true));
 
   // Create and attach an overlay scrollbar.
   scrollbar.reset(new FakeScrollbar(false, false, true));
@@ -99,7 +100,8 @@ TEST(ScrollbarLayerTest, ShouldScrollNonOverlayOnMainThread) {
   // may be handled in the compositor.
   EXPECT_EQ(InputHandler::ScrollIgnored,
             scrollbar_layer_impl->TryScroll(gfx::Point(0, 0),
-                                            InputHandler::Gesture));
+                                            InputHandler::Gesture,
+                                            true));
 }
 
 TEST(ScrollbarLayerTest, ScrollOffsetSynchronization) {