DevTools: merge browser_protocol.json files from content and core/inspector.

chrome/browser/devtools/devtools_protocol_constants_generator.py

Index: chrome/browser/devtools/devtools_protocol_constants_generator.py
diff --git a/chrome/browser/devtools/devtools_protocol_constants_generator.py b/chrome/browser/devtools/devtools_protocol_constants_generator.py
index 1c84bbdc8df8834d81de0889df8a3a497fa5a472..05c28533997566baa96c14b15afc71fbad630470 100755
--- a/chrome/browser/devtools/devtools_protocol_constants_generator.py
+++ b/chrome/browser/devtools/devtools_protocol_constants_generator.py
@@ -11,7 +11,6 @@ package = sys.argv[1]
 output_cc_path = sys.argv[2]
 output_h_path = sys.argv[3]
 blink_protocol_path = sys.argv[4]
-browser_protocol_path = sys.argv[5] if len(sys.argv) > 5 else None
 
 template_h = string.Template("""\
 // Copyright 2013 The Chromium Authors. All rights reserved.
@@ -24,8 +23,7 @@ template_h = string.Template("""\
 // THIS FILE IS AUTOGENERATED. DO NOT EDIT.
 // Generated by
 //  chrome/browser/devtools/devtools_protocol_constants_generator.py from
-//  gen/blink/core/inspector/protocol.json and
-//  content/browser/devtools/browser_protocol.json
+//  gen/blink/core/inspector/protocol.json
 
 #include <string>
 
@@ -53,8 +51,7 @@ template_cc = string.Template("""\
 // THIS FILE IS AUTOGENERATED. DO NOT EDIT.
 // Generated by
 //  chrome/browser/devtools/devtools_protocol_constants_generator.py from
-//  gen/blink/core/inspector/protocol.json and
-//  content/browser/devtools/browser_protocol.json
+//  gen/blink/core/inspector/protocol.json
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
@@ -158,11 +155,6 @@ blink_version = blink_protocol["version"]
 
 domains = blink_protocol["domains"]
 
-if browser_protocol_path:
-  browser_protocol_data = open(browser_protocol_path).read()
-  browser_protocol = json.loads(browser_protocol_data)
-  domains = domains + browser_protocol["domains"]
-
 namespace_tree = {}
 
 for domain in domains: