[DevTools] Remove handlers = browser from protocol definition.

content/browser/devtools/protocol/devtools_protocol_handler_generator.py

 #!/usr/bin/env python
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import sys
 import string
 import json
 
 blink_protocol_path = sys.argv[1]
@@ skipping 463 matching lines @@
   req_fields_num = 0
   for json_prop in json_properties:
     prop_map = mapping.copy()
     prop_map["proto_param"] = json_prop["name"]
     prop_map["param"] = Uncamelcase(json_prop["name"])
     prop_map["Param"] = Capitalize(json_prop["name"])
     prop_map["subdomain"] = Uncamelcase(prop_map["declared_name"])
     del prop_map["declared_name"]
     ResolveType(json_prop, prop_map)
     prop_map["declared_name"] = mapping["declared_name"]
+    if prop_map["pass_type"].find(mapping["declared_name"]) != -1:
+      prop_map["pass_type"] = prop_map["pass_type"].replace(
+          mapping["declared_name"], mapping["declared_name"] + "Builder<0>")
     if json_prop.get("optional"):
       methods.append(tmpl_builder_setter_opt.substitute(prop_map))
     else:
       methods.append(tmpl_builder_setter_req.substitute(prop_map))
       enum_items.append("k%s" % prop_map["Param"]);
       fields_enum.append(tmpl_builder_enum.substitute(prop_map,
         ordinal = req_fields_num))
       req_fields_num += 1
 
   all_fields = "kAllSet"
@@ skipping 139 matching lines @@
   else:
     raise Exception("Unknown type at %s.%s %s" %
         (mapping["Domain"], mapping["command"], mapping["proto_param"]))
 
 setters = []
 fields = []
 
 includes = []
 fields_init = []
 
+browser_domains_list = ["Inspector", "Memory", "Page", "Emulation", "Security",
+    "IO", "Target", "ServiceWorker", "Input", "Tracing", "Storage",
+    "SystemInfo", "Tethering", "Schema"]
+browser_commands_list = [
+    "DOM.setFileInputFiles",
+    "Network.enable",
+    "Network.disable",
+    "Network.clearBrowserCache",
+    "Network.clearBrowserCookies",
+    "Network.getCookies",
+    "Network.deleteCookie",
+    "Network.setCookie",
+    "Network.canEmulateNetworkConditions",
+    "Network.emulateNetworkConditions"]
+
 for json_domain in all_domains:
   domain_map = {}
   domain_map["Domain"] = json_domain["domain"]
   domain_map["domain"] = Uncamelcase(json_domain["domain"])
 
   initializations = []
   client_methods = []
   client_method_impls = []
   domain_empty = True
   domain_needs_client = False
 
   if "commands" in json_domain:
     for json_command in json_domain["commands"]:
-      if (not ("handlers" in json_command) or
-          not ("browser" in json_command["handlers"])):
+      full_command_name = json_domain["domain"] + "." + json_command["name"]
+      if (json_domain["domain"] not in browser_domains_list and
+          full_command_name not in browser_commands_list):
         continue
       domain_empty = False
 
       command_map = domain_map.copy()
       command_map["command"] = json_command["name"]
       command_map["Command"] = Capitalize(json_command["name"])
 
       if "redirect" in json_command:
         redirect_domain = json_command["redirect"]
         if not (redirect_domain in redirects):
@@ skipping 49 matching lines @@
                 args = "\n      " + ",\n      ".join(args)))
         client_methods.append(tmpl_response.substitute(command_map))
         client_method_impls.append(tmpl_response_impl.substitute(command_map))
       else:
         wrap = []
         if "returns" in json_command:
           for json_param in json_command["returns"]:
             param_map = command_map.copy()
             param_map["proto_param"] = json_param["name"]
             param_map["param"] = Uncamelcase(json_param["name"])
-            if json_param.get("optional"):
+            is_string = "type" in json_param and json_param["type"] == "string"
+            if json_param.get("optional") and not is_string:
               # TODO(vkuzkokov) Implement Optional<T> for value types.
-              raise Exception("Optional return values are not implemented")
+              raise Exception(
+                  "Optional return values are not implemented (%s.%s.%s)" %
+                  (param_map["Domain"], param_map["command"],
+                   param_map["proto_param"]))
             ResolveType(json_param, param_map)
             prep.append(tmpl_prep_output.substitute(param_map))
             args.append(param_map["arg_out"])
             wrap.append(tmpl_wrap.substitute(param_map))
         args_str = ""
         if len(args) > 0:
           args_str = "\n      " + ",\n      ".join(args)
         handler_method_impls.append(tmpl_callback_impl.substitute(command_map,
             prep = "".join(prep),
             args = args_str,
             wrap = "".join(wrap)))
 
       initializations.append(tmpl_register.substitute(command_map))
       handler_methods.append(tmpl_callback.substitute(command_map))
 
   if "events" in json_domain:
     for json_event in json_domain["events"]:
-      if (not ("handlers" in json_event) or
-          not ("browser" in json_event["handlers"])):
+      if json_domain["domain"] not in browser_domains_list:
         continue
       domain_empty = False
       domain_needs_client = True
 
       event_map = domain_map.copy()
       event_map["command"] = json_event["name"]
       event_map["Command"] = Capitalize(json_event["name"])
 
       json_parameters = []
       if "parameters" in json_event:
@@ skipping 37 matching lines @@
 output_h_file.close()
 
 output_cc_file.write(template_cc.substitute({},
     major = blink_protocol["version"]["major"],
     minor = blink_protocol["version"]["minor"],
     includes = "".join(sorted(includes)),
     fields_init = ",\n      ".join(fields_init),
     methods = "\n".join(handler_method_impls),
     types = "\n".join(type_impls)))
 output_cc_file.close()