Communicate whether passive event listeners exist to cc.

cc/layers/layer_unittest.cc

Index: cc/layers/layer_unittest.cc
diff --git a/cc/layers/layer_unittest.cc b/cc/layers/layer_unittest.cc
index f73cb2543cc638a8c0a3bd027c94032d3588bcb1..33c9b93978d83f4d861b30090fc63f90a8fad91b 100644
--- a/cc/layers/layer_unittest.cc
+++ b/cc/layers/layer_unittest.cc
@@ -133,8 +133,8 @@ class LayerSerializationTest : public testing::Test {
     EXPECT_EQ(src->masks_to_bounds_, dest->masks_to_bounds_);
     EXPECT_EQ(src->should_scroll_on_main_thread_,
               dest->should_scroll_on_main_thread_);
-    EXPECT_EQ(src->have_wheel_event_handlers_,
-              dest->have_wheel_event_handlers_);
+    EXPECT_EQ(src->touch_event_properties_, dest->touch_event_properties_);
+    EXPECT_EQ(src->wheel_event_properties_, dest->wheel_event_properties_);
     EXPECT_EQ(src->have_scroll_event_handlers_,
               dest->have_scroll_event_handlers_);
     EXPECT_EQ(src->non_fast_scrollable_region_,
@@ -250,7 +250,8 @@ class LayerSerializationTest : public testing::Test {
     layer->has_render_surface_ = false;
     layer->masks_to_bounds_ = true;
     layer->should_scroll_on_main_thread_ = false;
-    layer->have_wheel_event_handlers_ = true;
+    layer->touch_event_properties_ = EventListenerProperties::PASSIVE;
+    layer->wheel_event_properties_ = EventListenerProperties::BLOCKING;
     layer->have_scroll_event_handlers_ = false;
     layer->non_fast_scrollable_region_ = Region(gfx::Rect(5, 1, 14, 3));
     layer->touch_event_handler_region_ = Region(gfx::Rect(3, 14, 1, 5));
@@ -301,7 +302,8 @@ class LayerSerializationTest : public testing::Test {
     layer->masks_to_bounds_ = !layer->masks_to_bounds_;
     layer->should_scroll_on_main_thread_ =
         !layer->should_scroll_on_main_thread_;
-    layer->have_wheel_event_handlers_ = !layer->have_wheel_event_handlers_;
+    layer->touch_event_properties_ = EventListenerProperties::NONE;
+    layer->wheel_event_properties_ = EventListenerProperties::PASSIVE;
     layer->have_scroll_event_handlers_ = !layer->have_scroll_event_handlers_;
     layer->non_fast_scrollable_region_ = Region(gfx::Rect(5, 1, 14, 3));
     layer->touch_event_handler_region_ = Region(gfx::Rect(3, 14, 1, 5));
@@ -970,7 +972,10 @@ TEST_F(LayerTest, CheckPropertyChangeCausesCorrectBehavior) {
   EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetShouldScrollOnMainThread(true));
   EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetNonFastScrollableRegion(
       Region(gfx::Rect(1, 1, 2, 2))));
-  EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetHaveWheelEventHandlers(true));
+  EXPECT_SET_NEEDS_COMMIT(
+      1, test_layer->SetTouchEventProperties(EventListenerProperties::PASSIVE));
+  EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetWheelEventProperties(
+                                 EventListenerProperties::BLOCKING));
   EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetHaveScrollEventHandlers(true));
   EXPECT_SET_NEEDS_COMMIT(1, test_layer->SetTransform(
       gfx::Transform(0.0, 0.0, 0.0, 0.0, 0.0, 0.0)));