Switch HeadlessDevToolsManagerDelegate to use base::Bind.

headless/lib/browser/headless_devtools_manager_delegate.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_manager_delegate.h"
 
 #include <string>
 #include <utility>
 
 #include "content/public/browser/browser_thread.h"
@@ skipping 53 matching lines @@
     const std::string& param) {
   return CreateErrorResponse(
       command_id, kErrorInvalidParam,
       base::StringPrintf("Missing or invalid '%s' parameter", param.c_str()));
 }
 }  // namespace
 
 HeadlessDevToolsManagerDelegate::HeadlessDevToolsManagerDelegate(
     base::WeakPtr<HeadlessBrowserImpl> browser)
     : browser_(std::move(browser)) {
-  command_map_["Target.createTarget"] =
-      &HeadlessDevToolsManagerDelegate::CreateTarget;
-  command_map_["Target.closeTarget"] =
-      &HeadlessDevToolsManagerDelegate::CloseTarget;
+  command_map_["Target.createTarget"] = base::Bind(
+      &HeadlessDevToolsManagerDelegate::CreateTarget, base::Unretained(this));
+  command_map_["Target.closeTarget"] = base::Bind(
+      &HeadlessDevToolsManagerDelegate::CloseTarget, base::Unretained(this));
   command_map_["Target.createBrowserContext"] =
-      &HeadlessDevToolsManagerDelegate::CreateBrowserContext;
+      base::Bind(&HeadlessDevToolsManagerDelegate::CreateBrowserContext,
+                 base::Unretained(this));
   command_map_["Target.disposeBrowserContext"] =
-      &HeadlessDevToolsManagerDelegate::DisposeBrowserContext;
+      base::Bind(&HeadlessDevToolsManagerDelegate::DisposeBrowserContext,
+                 base::Unretained(this));
 }
 
 HeadlessDevToolsManagerDelegate::~HeadlessDevToolsManagerDelegate() {}
 
 base::DictionaryValue* HeadlessDevToolsManagerDelegate::HandleCommand(
     content::DevToolsAgentHost* agent_host,
     base::DictionaryValue* command) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   if (!browser_)
     return nullptr;
 
   int id;
   std::string method;
-  if (!command->GetInteger("id", &id) ||
-      !command->GetString("method", &method)) {
+  if (!command->GetInteger("id", &id) || !command->GetString("method", &method))
     return nullptr;
-  }
+
   auto find_it = command_map_.find(method);
   if (find_it == command_map_.end())
     return nullptr;
-  CommandMemberFnPtr command_fn_ptr = find_it->second;
+
   const base::DictionaryValue* params = nullptr;
   command->GetDictionary("params", &params);
-  std::unique_ptr<base::DictionaryValue> cmd_result(
-      ((this)->*command_fn_ptr)(id, params));
+  auto cmd_result = find_it->second.Run(id, params);
   return cmd_result.release();
 }
 
 scoped_refptr<content::DevToolsAgentHost>
 HeadlessDevToolsManagerDelegate::CreateNewTarget(const GURL& url) {
   HeadlessBrowserContext* context = browser_->GetDefaultBrowserContext();
   HeadlessWebContentsImpl* web_contents_impl = HeadlessWebContentsImpl::From(
       context->CreateWebContentsBuilder()
           .SetInitialURL(url)
           .SetWindowSize(browser_->options()->window_size)
@@ skipping 112 matching lines @@
 
   std::unique_ptr<base::Value> result(
       target::DisposeBrowserContextResult::Builder()
           .SetSuccess(success)
           .Build()
           ->Serialize());
   return CreateSuccessResponse(command_id, std::move(result));
 }
 
 }  // namespace headless