Revert of Fix BluetoothAdapterProfileChromeOS lifecycle management

device/bluetooth/bluetooth_socket_chromeos.h

 // 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.
 
 #ifndef DEVICE_BLUETOOTH_BLUETOOTH_SOCKET_CHROMEOS_H_
 #define DEVICE_BLUETOOTH_BLUETOOTH_SOCKET_CHROMEOS_H_
 
 #include <queue>
 #include <string>
 
@@ skipping 130 matching lines @@
 
   // Method run on the socket thread with a valid file descriptor |fd|, once
   // complete calls |callback| on the UI thread with an appropriate argument
   // indicating success or failure.
   void DoConnect(scoped_ptr<dbus::FileDescriptor> fd,
                  const ConfirmationCallback& callback);
 
   // Method run to clean-up a listening socket.
   void DoCloseListening();
 
-  // Unregisters this socket's usage of the Bluetooth profile which cleans up
-  // the profile if no one is using it.
+  // Unregister the underlying profile client object from the Bluetooth Daemon.
   void UnregisterProfile();
 
+  // Releases the profile after the delegate is gone.
+  void ReleaseProfile(BluetoothAdapterProfileChromeOS* profile);
+
   // Adapter the profile is registered against
   scoped_refptr<device::BluetoothAdapter> adapter_;
 
   // Address and D-Bus object path of the device being connected to, empty and
   // ignored if the socket is listening.
   std::string device_address_;
   dbus::ObjectPath device_path_;
 
   // UUID of the profile being connected to, or listening on.
   device::BluetoothUUID uuid_;
@@ skipping 27 matching lines @@
     bool cancelled;
   };
   std::queue<linked_ptr<ConnectionRequest> > connection_request_queue_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothSocketChromeOS);
 };
 
 }  // namespace chromeos
 
 #endif  // DEVICE_BLUETOOTH_BLUETOOTH_SOCKET_CHROMEOS_H_