Cleanup headless templates and message_dispatcher.h.

headless/lib/browser/devtools_api/domain_h.template

 // This file is generated
 
-// Copyright (c) 2016 The Chromium Authors. All rights reserved.
+// Copyright 2016 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.
 
 #ifndef HEADLESS_PUBLIC_DEVTOOLS_DOMAINS_{{domain.domain | camelcase_to_hacker_style | upper}}_H_
 #define HEADLESS_PUBLIC_DEVTOOLS_DOMAINS_{{domain.domain | camelcase_to_hacker_style | upper}}_H_
 
 #include "base/callback.h"
 #include "base/observer_list.h"
 #include "base/values.h"
 {% for domain_name in domain.dependencies %}
@@ skipping 17 matching lines @@
       {% if parameter.get("optional", False) -%}
         {% break %}
       {% endif %}
       {% if not loop.first %}, {% endif %}
 {{resolve_type(parameter).pass_type}} {{parameter.name | camelcase_to_hacker_style -}}
     {% endfor %}
     {% if command.get("parameters", []) and not command.parameters[0].get("optional", False) %}, {% endif %}{# -#}
     {% if command.get("returns", []) -%}
       base::Callback<void(std::unique_ptr<{{method_name}}Result>)> callback = base::Callback<void(std::unique_ptr<{{method_name}}Result>)>(){##}
     {% else -%}
-      base::Callback<void()> callback = base::Callback<void()>(){##}
+      base::Closure callback = base::Closure(){##}
     {% endif %});
     {# If the command has no return value, generate a convenience method that #}
-    {# accepts a base::Callback<void()> together with the parameters object. #}
+    {# accepts a base::Closure together with the parameters object. #}
     {% if not command.get("returns", []) %}
-  void {{method_name}}(std::unique_ptr<{{method_name}}Params> params, base::Callback<void()> callback);
+  void {{method_name}}(std::unique_ptr<{{method_name}}Params> params, base::Closure callback);
     {% endif %}
   {% endif %}
 {% endmacro %}
 
 namespace headless {
 namespace {{domain.domain | camelcase_to_hacker_style}} {
 class HEADLESS_EXPORT ExperimentalDomain;
 class HEADLESS_EXPORT ExperimentalObserver;
 {% if "events" in domain %}
 
@@ skipping 100 matching lines @@
   {% endfor %}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ExperimentalDomain);
 };
 
 }  // namespace {{domain.domain | camelcase_to_hacker_style}}
 }  // namespace headless
 
 #endif  // HEADLESS_PUBLIC_DEVTOOLS_DOMAINS_{{domain.domain | camelcase_to_hacker_style | upper}}_H_