mojo::Callback -> base::Callback

mojo/public/cpp/bindings/lib/router.cc

 // 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.
 
 #include "mojo/public/cpp/bindings/lib/router.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 115 matching lines @@
       incoming_receiver_(nullptr),
       next_request_id_(0),
       testing_mode_(false),
       pending_task_for_messages_(false),
       encountered_error_(false),
       weak_factory_(this) {
   filters_.SetSink(&thunk_);
   if (expects_sync_requests)
     connector_.AllowWokenUpBySyncWatchOnSameThread();
   connector_.set_incoming_receiver(filters_.GetHead());
-  connector_.set_connection_error_handler([this]() { OnConnectionError(); });
+  connector_.set_connection_error_handler(
+      base::Bind(&Router::OnConnectionError, base::Unretained(this)));
 }
 
 Router::~Router() {}
 
 bool Router::Accept(Message* message) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!message->has_flag(kMessageExpectsResponse));
   return connector_.Accept(message);
 }
 
@@ skipping 155 matching lines @@
 
   if (connector_.during_sync_handle_watcher_callback()) {
     // We don't want the error handler to reenter an ongoing sync call.
     connector_.task_runner()->PostTask(
         FROM_HERE,
         base::Bind(&Router::OnConnectionError, weak_factory_.GetWeakPtr()));
     return;
   }
 
   encountered_error_ = true;
-  error_handler_.Run();
+  if (!error_handler_.is_null())
+    error_handler_.Run();
 }
 
 // ----------------------------------------------------------------------------
 
 }  // namespace internal
 }  // namespace mojo