| Index: mojo/dbus/dbus_external_service.cc
|
| diff --git a/mojo/dbus/dbus_external_service.cc b/mojo/dbus/dbus_external_service.cc
|
| index 3a13cf7b521c336187a151ae4e1d1f6206158967..92cd6f3e1d6498474440bdd00e8d7b6d9c445e61 100644
|
| --- a/mojo/dbus/dbus_external_service.cc
|
| +++ b/mojo/dbus/dbus_external_service.cc
|
| @@ -16,7 +16,6 @@
|
| #include "dbus/object_path.h"
|
| #include "mojo/common/channel_init.h"
|
| #include "mojo/public/cpp/bindings/error_handler.h"
|
| -#include "mojo/public/cpp/bindings/remote_ptr.h"
|
| #include "mojo/public/cpp/shell/application.h"
|
| #include "mojo/public/interfaces/shell/shell.mojom.h"
|
| #include "mojo/shell/external_service.mojom.h"
|
| @@ -37,10 +36,6 @@ void DBusExternalServiceBase::Start() {
|
| DVLOG(1) << "External service started";
|
| }
|
|
|
| -void DBusExternalServiceBase::OnError() {
|
| - Disconnect();
|
| -}
|
| -
|
| void DBusExternalServiceBase::ConnectChannel(
|
| dbus::MethodCall* method_call,
|
| dbus::ExportedObject::ResponseSender sender) {
|
| @@ -61,7 +56,7 @@ void DBusExternalServiceBase::ConnectChannel(
|
| base::MessageLoopProxy::current());
|
| CHECK(message_pipe.is_valid());
|
|
|
| - Connect(mojo::ScopedExternalServiceHostHandle::From(message_pipe.Pass()));
|
| + Connect(message_pipe.Pass());
|
| sender.Run(dbus::Response::FromMethodCall(method_call));
|
| }
|
|
|
|
|