1 files changed, 6 insertions, 22 deletions
diff --git a/service/ipc/dbus/bluetooth_adapter.cc b/service/ipc/dbus/bluetooth_adapter.cc
index 6831c1b93..fd6688a94 100644
--- a/service/ipc/dbus/bluetooth_adapter.cc
+++ b/service/ipc/dbus/bluetooth_adapter.cc
@@ -46,20 +46,6 @@ const char kDBusIntrospectMethod[] = "Introspect";
 namespace ipc {
 namespace dbus {
 
-#if defined(BASE_VER) && BASE_VER > 780000
-// New libchrome treats ResponseSender as base::OnceCallback so we need to move
-// ownership before calling ::Run()
-inline void RunResponse(std::unique_ptr<Response> response,
-                        ExportedObject::ResponseSender& response_sender) {
-  std::move(response_sender).Run(std::move(response));
-}
-#else
-inline void RunResponse(std::unique_ptr<Response> response,
-                        ExportedObject::ResponseSender& response_sender) {
-  response_sender.Run(std::move(response));
-}
-#endif
-
 BluetoothAdapter::BluetoothAdapter(scoped_refptr<Bus> bus,
                                    bluetooth::Adapter* adapter)
     : adapter_(adapter) {
@@ -86,15 +72,15 @@ BluetoothAdapter::BluetoothAdapter(scoped_refptr<Bus> bus,
 void BluetoothAdapter::Enable(MethodCall* method_call,
                               ExportedObject::ResponseSender response_sender) {
   VLOG(1) << __func__;
-  adapter_->Enable();
-  RunResponse(Response::FromMethodCall(method_call), response_sender);
+  adapter_->Enable(false);
+  response_sender.Run(Response::FromMethodCall(method_call));
 }
 
 void BluetoothAdapter::Disable(MethodCall* method_call,
                                ExportedObject::ResponseSender response_sender) {
   VLOG(1) << __func__;
   adapter_->Disable();
-  RunResponse(Response::FromMethodCall(method_call), response_sender);
+  response_sender.Run(Response::FromMethodCall(method_call));
 }
 
 void BluetoothAdapter::Introspect(
@@ -104,16 +90,14 @@ void BluetoothAdapter::Introspect(
   std::string output;
   if (!base::ReadFileToString(base::FilePath(kBindingsPath), &output)) {
     PLOG(ERROR) << "Can't read XML bindings from disk:";
-    RunResponse(ErrorResponse::FromMethodCall(
-                    method_call, "Can't read XML bindings from disk.", ""),
-                response_sender);
+    response_sender.Run(ErrorResponse::FromMethodCall(
+        method_call, "Can't read XML bindings from disk.", ""));
   }
-
   std::unique_ptr<Response> response(Response::FromMethodCall(method_call));
   MessageWriter writer(response.get());
   writer.AppendString(output);
 
-  RunResponse(std::move(response), response_sender);
+  response_sender.Run(std::move(response));
 }
 
 BluetoothAdapter::~BluetoothAdapter() {}