Revert of Fix BluetoothAdapterProfileChromeOS lifecycle management

device/bluetooth/bluetooth_socket_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_socket_chromeos.h"
 
 #include <queue>
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 92 matching lines @@
     return;
   }
 
   device_address_ = device->GetAddress();
   device_path_ = device->object_path();
   uuid_ = uuid;
   options_.reset(new BluetoothProfileManagerClient::Options());
   if (security_level == SECURITY_LEVEL_LOW)
     options_->require_authentication.reset(new bool(false));
 
-  adapter_ = device->adapter();
-
   RegisterProfile(device->adapter(), success_callback, error_callback);
 }
 
 void BluetoothSocketChromeOS::Listen(
     scoped_refptr<BluetoothAdapter> adapter,
     SocketType socket_type,
     const BluetoothUUID& uuid,
     const BluetoothAdapter::ServiceOptions& service_options,
     const base::Closure& success_callback,
     const ErrorCompletionCallback& error_callback) {
   DCHECK(ui_task_runner()->RunsTasksOnCurrentThread());
   DCHECK(!profile_);
 
   if (!uuid.IsValid()) {
     error_callback.Run(kInvalidUUID);
     return;
   }
 
-  adapter_ = adapter;
-  adapter_->AddObserver(this);
+  adapter->AddObserver(this);
 
   uuid_ = uuid;
   options_.reset(new BluetoothProfileManagerClient::Options());
   if (service_options.name)
     options_->name.reset(new std::string(*service_options.name));
 
   switch (socket_type) {
     case kRfcomm:
       options_->channel.reset(
           new uint16(service_options.channel ? *service_options.channel : 0));
@@ skipping 72 matching lines @@
 }
 
 void BluetoothSocketChromeOS::RegisterProfile(
     BluetoothAdapterChromeOS* adapter,
     const base::Closure& success_callback,
     const ErrorCompletionCallback& error_callback) {
   DCHECK(ui_task_runner()->RunsTasksOnCurrentThread());
   DCHECK(!profile_);
   DCHECK(adapter);
 
+  adapter_ = adapter;
+
   // If the adapter is not present, this is a listening socket and the
   // adapter isn't running yet.  Report success and carry on;
   // the profile will be registered when the daemon becomes available.
-  if (!adapter->IsPresent()) {
+  if (!adapter_->IsPresent()) {
     VLOG(1) << uuid_.canonical_value() << " on " << device_path_.value()
             << ": Delaying profile registration.";
     base::MessageLoop::current()->PostTask(FROM_HERE, success_callback);
     return;
   }
 
   VLOG(1) << uuid_.canonical_value() << " on " << device_path_.value()
           << ": Acquiring profile.";
 
   adapter->UseProfile(
@@ skipping 62 matching lines @@
                << error_message;
   UnregisterProfile();
   error_callback.Run(error_message);
 }
 
 void BluetoothSocketChromeOS::AdapterPresentChanged(BluetoothAdapter* adapter,
                                                     bool present) {
   DCHECK(ui_task_runner()->RunsTasksOnCurrentThread());
 
   if (!present) {
-    // Adapter removed, we can't use the profile anymore.
+    // Adapter removed, the profile is now invalid.
     UnregisterProfile();
     return;
   }
 
   DCHECK(!profile_);
 
   VLOG(1) << uuid_.canonical_value() << " on " << device_path_.value()
           << ": Acquiring profile.";
 
   static_cast<BluetoothAdapterChromeOS*>(adapter)->UseProfile(
@@ skipping 219 matching lines @@
     connection_request_queue_.pop();
   }
 }
 
 void BluetoothSocketChromeOS::UnregisterProfile() {
   DCHECK(ui_task_runner()->RunsTasksOnCurrentThread());
   DCHECK(profile_);
 
   VLOG(1) << profile_->object_path().value() << ": Release profile";
 
-  static_cast<BluetoothAdapterChromeOS*>(adapter_.get())
-      ->ReleaseProfile(device_path_, profile_);
+  profile_->RemoveDelegate(
+      device_path_,
+      base::Bind(&BluetoothSocketChromeOS::ReleaseProfile, this, profile_));
+
   profile_ = nullptr;
 }
 
+void BluetoothSocketChromeOS::ReleaseProfile(
+    BluetoothAdapterProfileChromeOS* profile) {
+  if (adapter_)
+    static_cast<BluetoothAdapterChromeOS*>(adapter_.get())
+        ->ReleaseProfile(uuid_);
+  else
+    delete profile;
+}
+
 }  // namespace chromeos