Merge from Chromium at DEPS revision r214332

This commit was generated by merge_to_master.py.

Change-Id: Ic107f0b7e2a17f181f4ec0f80e2b40fb4d3c13d9

1 files changed, 28 insertions, 0 deletions

diff --git a/Source/devtools/protocol.json b/Source/devtools/protocol.json
index d042f256d..cf3affb97 100644
--- a/Source/devtools/protocol.json
+++ b/Source/devtools/protocol.json
@@ -3830,5 +3830,33 @@
                 "name": "layerTreeDidChange"
             }
         ]
+    },
+    {
+        "domain": "Tracing",
+        "hidden": true,
+        "commands": [
+            {
+                "name": "start",
+                "description": "Strart trace events collection.",
+                "parameters": [
+                    { "name": "categories", "type": "string", "description": "Category/tag filter" }
+                ]
+            },
+            {
+                "name": "end",
+                "description": "Stop trace events collection."
+            }
+        ],
+        "events": [
+            {
+                "name": "dataCollected",
+                "parameters": [
+                    { "name": "value", "type": "array", "items": { "type": "object" } }
+                ]
+            },
+            {
+                "name": "tracingComplete"
+            }
+        ]
     }]
 }