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

content/browser/devtools/protocol/devtools_protocol_handler_generator.py

Index: content/browser/devtools/protocol/devtools_protocol_handler_generator.py
diff --git a/content/browser/devtools/protocol/devtools_protocol_handler_generator.py b/content/browser/devtools/protocol/devtools_protocol_handler_generator.py
index f9cb63cea09536f615e3c2f271dd42df43d818c6..1697708fe43b33555dd7aa05a6b99ba5e0d118b3 100755
--- a/content/browser/devtools/protocol/devtools_protocol_handler_generator.py
+++ b/content/browser/devtools/protocol/devtools_protocol_handler_generator.py
@@ -8,9 +8,8 @@ import string
 import json
 
 blink_protocol_path = sys.argv[1]
-browser_protocol_path = sys.argv[2]
-output_cc_path = sys.argv[3]
-output_h_path = sys.argv[4]
+output_cc_path = sys.argv[2]
+output_h_path = sys.argv[3]
 
 header = """\
 // Copyright 2014 The Chromium Authors. All rights reserved.
@@ -21,7 +20,6 @@ header = """\
 // Generated by
 //  content/public/browser/devtools_protocol_handler_generator.py from
 //  gen/blink/core/inspector/protocol.json and
-//  content/browser/devtools/browser_protocol.json
 """
 
 template_h = string.Template(header + """\
@@ -454,7 +452,6 @@ def Uncamelcase(s):
 
 types = {}
 blink_protocol = json.loads(open(blink_protocol_path, "r").read())
-browser_protocol = json.loads(open(browser_protocol_path, "r").read())
 type_decls = []
 type_impls = []
 handler_methods = []
@@ -462,7 +459,7 @@ handler_method_impls = []
 domain_maps = []
 redirects = {}
 
-all_domains = blink_protocol["domains"] + browser_protocol["domains"]
+all_domains = blink_protocol["domains"]
 
 for json_domain in all_domains:
   if "types" in json_domain: