Fix BluetoothAdapterProfileChromeOS lifecycle management

device/bluetooth/bluetooth_adapter_profile_chromeos.cc

Index: device/bluetooth/bluetooth_adapter_profile_chromeos.cc
diff --git a/device/bluetooth/bluetooth_adapter_profile_chromeos.cc b/device/bluetooth/bluetooth_adapter_profile_chromeos.cc
index 2feff37aed352abdbf8c54b8f42ecd096f465639..e25534b5f9f9dc85907f92f055b44b3d042351ec 100644
--- a/device/bluetooth/bluetooth_adapter_profile_chromeos.cc
+++ b/device/bluetooth/bluetooth_adapter_profile_chromeos.cc
@@ -19,29 +19,26 @@
 namespace chromeos {
 
 // static
-BluetoothAdapterProfileChromeOS* BluetoothAdapterProfileChromeOS::Register(
-    BluetoothAdapterChromeOS* adapter,
+void BluetoothAdapterProfileChromeOS::Register(
     const device::BluetoothUUID& uuid,
     const BluetoothProfileManagerClient::Options& options,
-    const base::Closure& success_callback,
+    const ProfileRegisteredCallback& success_callback,
     const BluetoothProfileManagerClient::ErrorCallback& error_callback) {
-  DCHECK(adapter);
-
-  BluetoothAdapterProfileChromeOS* profile =
-      new BluetoothAdapterProfileChromeOS(adapter, uuid);
+  scoped_ptr<BluetoothAdapterProfileChromeOS> profile(
+      new BluetoothAdapterProfileChromeOS(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;
+      profile->object_path(),
+      uuid.canonical_value(),
+      options,
+      base::Bind(success_callback, base::Passed(&profile)),
+                 error_callback);

[Ilya Sherman, 2015/03/09 18:18:51]

nit: Looks like the alignment is off here -- error_callback should be aligned
with "base::" of "base::Bind", right?

[Marie Janssen, 2015/03/09 18:38:40]

Done.

 }
 
 BluetoothAdapterProfileChromeOS::BluetoothAdapterProfileChromeOS(
-    BluetoothAdapterChromeOS* adapter,
     const device::BluetoothUUID& uuid)
-    : uuid_(uuid), adapter_(adapter), weak_ptr_factory_(this) {
+    : uuid_(uuid), weak_ptr_factory_(this) {
   std::string uuid_path;
   base::ReplaceChars(uuid.canonical_value(), ":-", "_", &uuid_path);
   object_path_ =
@@ -54,7 +51,6 @@ BluetoothAdapterProfileChromeOS::BluetoothAdapterProfileChromeOS(
 }
 
 BluetoothAdapterProfileChromeOS::~BluetoothAdapterProfileChromeOS() {
-  profile_.reset();
 }
 
 bool BluetoothAdapterProfileChromeOS::SetDelegate(