bluetooth: Remove callback from BluetoothGattConnection::Disconnect

extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_event_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 "extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_event_router.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 284 matching lines @@
     const base::Closure& callback,
     const ErrorCallback& error_callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (!adapter_.get()) {
     VLOG(1) << "BluetoothAdapter not ready.";
     error_callback.Run(kStatusErrorFailed);
     return;
   }
 
   const std::string extension_id = extension->id();
-  const std::string disconnect_id = extension_id + device_address;
-
-  if (disconnecting_devices_.count(disconnect_id) != 0) {
-    error_callback.Run(kStatusErrorInProgress);
-    return;
-  }
 
   BluetoothLowEnergyConnection* conn =
       FindConnection(extension_id, device_address);
   if (!conn || !conn->GetConnection()->IsConnected()) {
     VLOG(1) << "Application not connected to device: " << device_address;
     error_callback.Run(kStatusErrorNotConnected);
     return;
   }
 
-  disconnecting_devices_.insert(disconnect_id);
-  conn->GetConnection()->Disconnect(
-      base::Bind(&BluetoothLowEnergyEventRouter::OnDisconnect,
-                 weak_ptr_factory_.GetWeakPtr(),
-                 extension_id,
-                 device_address,
-                 callback));
+  conn->GetConnection()->Disconnect();
+  VLOG(2) << "GATT connection terminated.";
+
+  if (!RemoveConnection(extension_id, device_address)) {
+    VLOG(1) << "The connection was removed before disconnect completed, id: "
+            << extension_id << ", device: " << device_address;
+  }
+
+  callback.Run();
 }
 
 bool BluetoothLowEnergyEventRouter::GetServices(
     const std::string& device_address,
     ServiceList* out_services) const {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(out_services);
   if (!adapter_.get()) {
     VLOG(1) << "BluetoothAdapter not ready.";
     return false;
@@ skipping 937 matching lines @@
   BluetoothLowEnergyConnection* conn = new BluetoothLowEnergyConnection(
       persistent, extension_id, connection.Pass());
   ConnectionResourceManager* manager =
       GetConnectionResourceManager(browser_context_);
   manager->Add(conn);
 
   connecting_devices_.erase(connect_id);
   callback.Run();
 }
 
-void BluetoothLowEnergyEventRouter::OnDisconnect(
-    const std::string& extension_id,
-    const std::string& device_address,
-    const base::Closure& callback) {
-  VLOG(2) << "GATT connection terminated.";
-
-  const std::string disconnect_id = extension_id + device_address;
-  DCHECK_NE(0U, disconnecting_devices_.count(disconnect_id));
-
-  if (!RemoveConnection(extension_id, device_address)) {
-    VLOG(1) << "The connection was removed before disconnect completed, id: "
-            << extension_id << ", device: " << device_address;
-  }
-
-  disconnecting_devices_.erase(disconnect_id);
-  callback.Run();
-}
-
 void BluetoothLowEnergyEventRouter::OnError(
     const ErrorCallback& error_callback,
     BluetoothGattService::GattErrorCode error_code) {
   VLOG(2) << "Remote characteristic/descriptor value read/write failed.";
 
   error_callback.Run(GattErrorToRouterError(error_code));
 }
 
 void BluetoothLowEnergyEventRouter::OnConnectError(
     const std::string& extension_id,
@@ skipping 179 matching lines @@
       continue;
 
     manager->Remove(extension_id, *iter);
     return true;
   }
 
   return false;
 }
 
 }  // namespace extensions