Cleanup headless templates and message_dispatcher.h.

headless/lib/browser/devtools_api/domain_h.template

Index: headless/lib/browser/devtools_api/domain_h.template
diff --git a/headless/lib/browser/devtools_api/domain_h.template b/headless/lib/browser/devtools_api/domain_h.template
index 50c7c049561e8c22b49a9ee4ac0e7e0372888d4f..74b6b7a62bf67f31221a78e8e0e673abd192a343 100644
--- a/headless/lib/browser/devtools_api/domain_h.template
+++ b/headless/lib/browser/devtools_api/domain_h.template
@@ -1,6 +1,6 @@
 // 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.
 
@@ -38,12 +38,12 @@
     {% 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 %}