Fix BluetoothAdapterProfileChromeOS lifecycle management

device/bluetooth/bluetooth_adapter_profile_chromeos.cc

 // Copyright 2015 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_profile_chromeos.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "chromeos/dbus/bluetooth_profile_service_provider.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "dbus/bus.h"
 #include "dbus/object_path.h"
 #include "device/bluetooth/bluetooth_adapter_chromeos.h"
 #include "device/bluetooth/bluetooth_uuid.h"
 
 namespace chromeos {
 
 // static
 BluetoothAdapterProfileChromeOS* BluetoothAdapterProfileChromeOS::Register(
-    BluetoothAdapterChromeOS* adapter,
+    base::WeakPtr<BluetoothAdapterChromeOS> adapter,
     const device::BluetoothUUID& uuid,
     const BluetoothProfileManagerClient::Options& options,
     const base::Closure& success_callback,
     const BluetoothProfileManagerClient::ErrorCallback& error_callback) {
   DCHECK(adapter);
 
   BluetoothAdapterProfileChromeOS* profile =
       new BluetoothAdapterProfileChromeOS(adapter, uuid);
 
   VLOG(1) << "Registering profile: " << profile->object_path().value();
   DBusThreadManager::Get()->GetBluetoothProfileManagerClient()->RegisterProfile(
       profile->object_path(), uuid.canonical_value(), options, success_callback,
       error_callback);
 
   return profile;
 }
 
 BluetoothAdapterProfileChromeOS::BluetoothAdapterProfileChromeOS(
-    BluetoothAdapterChromeOS* adapter,
+    base::WeakPtr<BluetoothAdapterChromeOS> adapter,
     const device::BluetoothUUID& uuid)
     : uuid_(uuid), adapter_(adapter), weak_ptr_factory_(this) {
   std::string uuid_path;
   base::ReplaceChars(uuid.canonical_value(), ":-", "_", &uuid_path);
   object_path_ =
       dbus::ObjectPath("/org/chromium/bluetooth_profile/" + uuid_path);
 
   dbus::Bus* system_bus = DBusThreadManager::Get()->GetSystemBus();
   profile_.reset(
       BluetoothProfileServiceProvider::Create(system_bus, object_path_, this));
   DCHECK(profile_.get());
 }
 
 BluetoothAdapterProfileChromeOS::~BluetoothAdapterProfileChromeOS() {
+  adapter_->RemoveProfile(uuid_);

[Ilya Sherman, 2015/02/19 20:37:58]

Using a weak pointer doesn't prevent this line from crashing.  You still have to
explicitly null-check the profile.

   profile_.reset();

[Ilya Sherman, 2015/02/19 20:37:58]

This line should not be necessary in the destructor -- the scoped_ptr will reset
itself as it goes out of scope anyway.

[Marie Janssen, 2015/02/20 22:53:46]

After refactoring the ownership, these aren't needed here so we should be good.

 }
 
 bool BluetoothAdapterProfileChromeOS::SetDelegate(
     const dbus::ObjectPath& device_path,
     BluetoothProfileServiceProvider::Delegate* delegate) {
   DCHECK(delegate);
   VLOG(1) << "SetDelegate: " << object_path_.value() << " dev "
           << device_path.value();
 
   if (delegates_.find(device_path.value()) != delegates_.end()) {
@@ skipping 88 matching lines @@
   // Cancel() should only go to a delegate accepting connections.
   if (delegates_.find("") == delegates_.end()) {
     VLOG(1) << object_path_.value() << ": Cancel with no delegate!";
     return;
   }
 
   delegates_[""]->Cancel();
 }
 
 }  // namespace chromeos