Communicate whether passive event listeners exist to cc.

cc/test/layer_tree_json_parser.cc

Index: cc/test/layer_tree_json_parser.cc
diff --git a/cc/test/layer_tree_json_parser.cc b/cc/test/layer_tree_json_parser.cc
index 4dd3d661e13fc257178412002ea34177acd5bf35..f86c33cd6818554adcb2b01a2257b87ab1056314 100644
--- a/cc/test/layer_tree_json_parser.cc
+++ b/cc/test/layer_tree_json_parser.cc
@@ -20,6 +20,28 @@ namespace cc {
 
 namespace {
 
+bool GetEventListenerProperties(base::DictionaryValue* dict,
+                                const char* property,
+                                uint32_t* listener_properties) {
+  *listener_properties = EventListenerProperties::kNone;
+  base::ListValue* list;
+  bool success = true;
+  if (dict->HasKey(property)) {
+    success &= dict->GetList(property, &list);
+    std::string str;
+    for (size_t i = 0; i < list->GetSize(); i++) {
+      success &= list->GetString(i, &str);
+      if (str == "Blocking")
+        *listener_properties |= EventListenerProperties::kBlocking;
+      else if (str == "Passive")
+        *listener_properties |= EventListenerProperties::kPassive;
+      else
+        success = false;
+    }
+  }
+  return success;
+}
+
 scoped_refptr<Layer> ParseTreeFromValue(base::Value* val,
                                         ContentLayerClient* content_client) {
   base::DictionaryValue* dict;
@@ -125,9 +147,14 @@ scoped_refptr<Layer> ParseTreeFromValue(base::Value* val,
     new_layer->SetScrollClipLayerId(scrollable ? new_layer->id()
                                                : Layer::INVALID_ID);
 
-  bool wheel_handler;
-  if (dict->GetBoolean("WheelHandler", &wheel_handler))
-    new_layer->SetHaveWheelEventHandlers(wheel_handler);
+  uint32_t listener_properties;
+  success &=
+      GetEventListenerProperties(dict, "TouchHandler", &listener_properties);
+  new_layer->SetTouchEventProperties(listener_properties);
+
+  success &=
+      GetEventListenerProperties(dict, "WheelHandler", &listener_properties);
+  new_layer->SetWheelEventProperties(listener_properties);
 
   bool scroll_handler;
   if (dict->GetBoolean("ScrollHandler", &scroll_handler))