Fix BluetoothAdapterProfileChromeOS lifecycle management

device/bluetooth/bluetooth_adapter_chromeos.cc

 // Copyright 2013 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 "device/bluetooth/bluetooth_adapter_chromeos.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 67 matching lines @@
 void BluetoothAdapterChromeOS::Shutdown() {
   if (dbus_is_shutdown_)
     return;
   DCHECK(DBusThreadManager::IsInitialized())
       << "Call BluetoothAdapterFactory::Shutdown() before "
          "DBusThreadManager::Shutdown().";
 
   if (IsPresent())
     RemoveAdapter();  // Also deletes devices_.
   DCHECK(devices_.empty());
+  // profiles_ should be empty because all BluetoothSockets have been signaled
+  // that this adapter is disappearing.
+  DCHECK(profiles_.empty());

[armansito, 2015/02/27 21:04:57]

Do you need a DCHECK for |profile_queues_| being empty? Either way you should
clean it up either here or in the class destructor.

[Marie Janssen, 2015/02/27 22:56:06]

Done.

 
   DBusThreadManager::Get()->GetBluetoothAdapterClient()->RemoveObserver(this);
   DBusThreadManager::Get()->GetBluetoothDeviceClient()->RemoveObserver(this);
   DBusThreadManager::Get()->GetBluetoothInputClient()->RemoveObserver(this);
 
   VLOG(1) << "Unregistering pairing agent";
   DBusThreadManager::Get()->GetBluetoothAgentManagerClient()->UnregisterAgent(
       dbus::ObjectPath(kAgentPath), base::Bind(&base::DoNothing),
       base::Bind(&OnUnregisterAgentError));
 
@@ skipping 858 matching lines @@
   DCHECK(delegate);
 
   if (profiles_.find(uuid) != profiles_.end()) {
     // TODO(jamuraa) check that the options are the same and error when they are
     // not.
     SetProfileDelegate(uuid, device_path, delegate, success_callback,
                        error_callback);
     return;
   }
 
-  profiles_[uuid] = BluetoothAdapterProfileChromeOS::Register(
-      this, uuid, options,
-      base::Bind(&BluetoothAdapterChromeOS::OnRegisterProfile, this, uuid,
+  if (profile_queues_.find(uuid) == profile_queues_.end()) {
+    BluetoothAdapterProfileChromeOS::Register(
+        uuid, options,
+        base::Bind(&BluetoothAdapterChromeOS::OnRegisterProfile, this, uuid),
+        base::Bind(&BluetoothAdapterChromeOS::OnRegisterProfileError, this,
+                   uuid));
+
+    profile_queues_[uuid] = new std::vector<RegisterProfileCompletionPair>();
+  }
+
+  profile_queues_[uuid]->push_back(std::make_pair(
+      base::Bind(&BluetoothAdapterChromeOS::SetProfileDelegate, this, uuid,
                  device_path, delegate, success_callback, error_callback),
-      base::Bind(&BluetoothAdapterChromeOS::OnRegisterProfileError, this, uuid,
-                 error_callback));
+      error_callback));
 }
 
-void BluetoothAdapterChromeOS::ReleaseProfile(const BluetoothUUID& uuid) {
+void BluetoothAdapterChromeOS::ReleaseProfile(
+    const dbus::ObjectPath& device_path,
+    BluetoothAdapterProfileChromeOS* profile) {
+  VLOG(2) << "Releasing Profile: " << profile->uuid().canonical_value()
+          << " from " << device_path.value();
+  profile->RemoveDelegate(
+      device_path, base::Bind(&BluetoothAdapterChromeOS::RemoveProfile,
+                              weak_ptr_factory_.GetWeakPtr(), profile->uuid()));
+}
+
+void BluetoothAdapterChromeOS::RemoveProfile(const BluetoothUUID& uuid) {
   if (profiles_.find(uuid) != profiles_.end()) {
     delete profiles_[uuid];
     profiles_.erase(uuid);
   }
 }
 
 void BluetoothAdapterChromeOS::OnRegisterProfile(
     const BluetoothUUID& uuid,
-    const dbus::ObjectPath& device_path,
-    BluetoothProfileServiceProvider::Delegate* delegate,
-    const ProfileRegisteredCallback& success_callback,
-    const ErrorCompletionCallback& error_callback) {
-  SetProfileDelegate(uuid, device_path, delegate, success_callback,
-                     error_callback);
+    BluetoothAdapterProfileChromeOS* profile) {
+  profiles_[uuid] = profile;
+  for (auto& it : *profile_queues_[uuid]) {
+    it.first.Run();
+  }
+  delete profile_queues_[uuid];
+  profile_queues_.erase(uuid);
 }
 
-bool BluetoothAdapterChromeOS::SetProfileDelegate(
+void BluetoothAdapterChromeOS::SetProfileDelegate(
     const BluetoothUUID& uuid,
     const dbus::ObjectPath& device_path,
     BluetoothProfileServiceProvider::Delegate* delegate,
     const ProfileRegisteredCallback& success_callback,
     const ErrorCompletionCallback& error_callback) {
   if (profiles_[uuid]->SetDelegate(device_path, delegate)) {
     success_callback.Run(profiles_[uuid]);
-    return true;
+    return;
   }
   // Already set
   error_callback.Run(bluetooth_agent_manager::kErrorAlreadyExists);
-  return false;
 }
 
 void BluetoothAdapterChromeOS::OnRegisterProfileError(
     const BluetoothUUID& uuid,
-    const ErrorCompletionCallback& error_callback,
     const std::string& error_name,
     const std::string& error_message) {
-  LOG(WARNING) << object_path_.value()
-               << ": Failed to register profile: " << error_name << ": "
-               << error_message;
-  error_callback.Run(error_message);
-  ReleaseProfile(uuid);
+  VLOG(2) << object_path_.value() << ": Failed to register profile: "
+          << error_name << ": " << error_message;
+  for (auto& it : *profile_queues_[uuid]) {
+    it.second.Run(error_message);
+  }

[armansito, 2015/02/27 21:04:57]

nit: no need for curly braces in single-line if body.

[Marie Janssen, 2015/02/27 22:56:06]

Done.

+  delete profile_queues_[uuid];
+  profile_queues_.erase(uuid);
 }
 
 void BluetoothAdapterChromeOS::OnSetDiscoverable(
     const base::Closure& callback,
     const ErrorCallback& error_callback,
     bool success) {
   DCHECK(IsPresent());
   // Set the discoverable_timeout property to zero so the adapter remains
   // discoverable forever.
   DBusThreadManager::Get()->GetBluetoothAdapterClient()->
@@ skipping 191 matching lines @@
 
     // If the queued request resulted in a pending call, then let it
     // asynchonously process the remaining queued requests once the pending
     // call returns.
     if (discovery_request_pending_)
       return;
   }
 }
 
 }  // namespace chromeos