Cleanup headless templates and message_dispatcher.h.

headless/lib/browser/headless_devtools_client_impl.cc

 // 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.
 
 #include "headless/lib/browser/headless_devtools_client_impl.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
@@ skipping 315 matching lines @@
 void HeadlessDevToolsClientImpl::SendMessageWithParams(
     const char* method,
     std::unique_ptr<base::Value> params,
     CallbackType callback) {
   base::DictionaryValue message;
   message.SetString("method", method);
   message.Set("params", std::move(params));
   FinalizeAndSendMessage(&message, std::move(callback));
 }
 
-template <typename CallbackType>
-void HeadlessDevToolsClientImpl::SendMessageWithoutParams(
-    const char* method,
-    CallbackType callback) {
-  base::DictionaryValue message;
-  message.SetString("method", method);
-  FinalizeAndSendMessage(&message, std::move(callback));
-}
-
 void HeadlessDevToolsClientImpl::SendMessage(
     const char* method,
     std::unique_ptr<base::Value> params,
     base::Callback<void(const base::Value&)> callback) {
   SendMessageWithParams(method, std::move(params), std::move(callback));
 }
 
 void HeadlessDevToolsClientImpl::SendMessage(
     const char* method,
     std::unique_ptr<base::Value> params,
-    base::Callback<void()> callback) {
+    base::Closure callback) {
   SendMessageWithParams(method, std::move(params), std::move(callback));
 }
 
-void HeadlessDevToolsClientImpl::SendMessage(
-    const char* method,
-    base::Callback<void(const base::Value&)> callback) {
-  SendMessageWithoutParams(method, std::move(callback));
-}
-
-void HeadlessDevToolsClientImpl::SendMessage(const char* method,
-                                             base::Callback<void()> callback) {
-  SendMessageWithoutParams(method, std::move(callback));
-}
-
 void HeadlessDevToolsClientImpl::RegisterEventHandler(
     const char* method,
     base::Callback<void(const base::Value&)> callback) {
   DCHECK(event_handlers_.find(method) == event_handlers_.end());
   event_handlers_[method] = callback;
 }
 
 HeadlessDevToolsClientImpl::Callback::Callback() {}
 
 HeadlessDevToolsClientImpl::Callback::Callback(Callback&& other) = default;
 
-HeadlessDevToolsClientImpl::Callback::Callback(base::Callback<void()> callback)
+HeadlessDevToolsClientImpl::Callback::Callback(base::Closure callback)
     : callback(callback) {}
 
 HeadlessDevToolsClientImpl::Callback::Callback(
     base::Callback<void(const base::Value&)> callback)
     : callback_with_result(callback) {}
 
 HeadlessDevToolsClientImpl::Callback::~Callback() {}
 
 HeadlessDevToolsClientImpl::Callback& HeadlessDevToolsClientImpl::Callback::
 operator=(Callback&& other) = default;
 
 }  // namespace headless