Bluez: Move released profiles to a separate map.

device/bluetooth/bluez/bluetooth_adapter_bluez.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/bluez/bluetooth_adapter_bluez.h"
 
 #include <memory>
 #include <set>
 #include <string>
 #include <utility>
@@ skipping 105 matching lines @@
   // Since we don't initialize anything if Object Manager is not supported,
   // no need to do any clean up.
   if (!bluez::BluezDBusManager::Get()->IsObjectManagerSupported()) {
     dbus_is_shutdown_ = true;
     return;
   }
 
   if (IsPresent())
     RemoveAdapter();  // Also deletes devices_.
   DCHECK(devices_.empty());
-  // profiles_ is empty because all BluetoothSockets have been notified
+
+  // profiles_ must be empty because all BluetoothSockets have been notified
   // that this adapter is disappearing.
   DCHECK(profiles_.empty());
 
+  // Some profiles may have been released but not yet removed; it is safe to
+  // delete them.
+  for (auto& it : released_profiles_)
+    delete it.second;
+  released_profiles_.clear();
+
   for (auto& it : profile_queues_)
     delete it.second;
   profile_queues_.clear();
 
   bluez::BluezDBusManager::Get()->GetBluetoothAdapterClient()->RemoveObserver(
       this);
   bluez::BluezDBusManager::Get()->GetBluetoothDeviceClient()->RemoveObserver(
       this);
   bluez::BluezDBusManager::Get()->GetBluetoothInputClient()->RemoveObserver(
       this);
@@ skipping 862 matching lines @@
       base::Bind(&BluetoothAdapterBlueZ::SetProfileDelegate, this, uuid,
                  device_path, delegate, success_callback, error_callback),
       error_callback));
 }
 
 void BluetoothAdapterBlueZ::ReleaseProfile(
     const dbus::ObjectPath& device_path,
     BluetoothAdapterProfileBlueZ* profile) {
   VLOG(2) << "Releasing Profile: " << profile->uuid().canonical_value()
           << " from " << device_path.value();
-  profile->RemoveDelegate(
-      device_path, base::Bind(&BluetoothAdapterBlueZ::RemoveProfile,
-                              weak_ptr_factory_.GetWeakPtr(), profile->uuid()));
+  BluetoothUUID uuid = profile->uuid();
+  auto iter = profiles_.find(uuid);
+  if (iter == profiles_.end()) {
+    LOG(ERROR) << "Profile not found for: " << uuid.canonical_value();
+    return;
+  }
+  released_profiles_[uuid] = iter->second;
+  profiles_.erase(iter);
+  profile->RemoveDelegate(device_path,
+                          base::Bind(&BluetoothAdapterBlueZ::RemoveProfile,
+                                     weak_ptr_factory_.GetWeakPtr(), uuid));
 }
 
 void BluetoothAdapterBlueZ::RemoveProfile(const BluetoothUUID& uuid) {
   VLOG(2) << "Remove Profile: " << uuid.canonical_value();
 
-  if (profiles_.find(uuid) != profiles_.end()) {
-    delete profiles_[uuid];
-    profiles_.erase(uuid);
+  auto iter = released_profiles_.find(uuid);
+  if (iter == released_profiles_.end()) {
+    LOG(ERROR) << "Released Profile not found: " << uuid.canonical_value();
+    return;
   }
+  delete iter->second;
+  released_profiles_.erase(iter);
 }
 
 void BluetoothAdapterBlueZ::AddLocalGattService(
     std::unique_ptr<BluetoothLocalGattServiceBlueZ> service) {
   owned_gatt_services_.push_back(std::move(service));
 }
 
 void BluetoothAdapterBlueZ::OnRegisterProfile(
     const BluetoothUUID& uuid,
     std::unique_ptr<BluetoothAdapterProfileBlueZ> profile) {
@@ skipping 422 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 bluez