bluetooth: BluetoothAdapterDeleter used to control BluetoothAdapter destruction.

device/bluetooth/bluetooth_adapter.h

 // Copyright (c) 2012 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_ADAPTER_H_
 #define DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_H_
 
 #include <list>
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "device/bluetooth/bluetooth_export.h"
 
 namespace device {
 
 class BluetoothDiscoverySession;
 class BluetoothGattCharacteristic;
 class BluetoothGattDescriptor;
 class BluetoothGattService;
 class BluetoothSocket;
 class BluetoothUUID;
+struct BluetoothAdapterDeleter;
 
 // BluetoothAdapter represents a local Bluetooth adapter which may be used to
 // interact with remote Bluetooth devices. As well as providing support for
 // determining whether an adapter is present and whether the radio is powered,
 // this class also provides support for obtaining the list of remote devices
 // known to the adapter, discovering new devices, and providing notification of
 // updates to device information.
 class DEVICE_BLUETOOTH_EXPORT BluetoothAdapter
-    : public base::RefCounted<BluetoothAdapter> {
+    : public base::RefCountedThreadSafe<BluetoothAdapter,
+                                        BluetoothAdapterDeleter> {
  public:
   // Interface for observing changes from bluetooth adapters.
   class Observer {
    public:
     virtual ~Observer() {}
 
     // Called when the presence of the adapter |adapter| changes. When |present|
     // is true the adapter is now present, false means the adapter has been
     // removed from the system.
     virtual void AdapterPresentChanged(BluetoothAdapter* adapter,
@@ skipping 280 matching lines @@
   // BluetoothSocket instance that is to be owned by the received.
   // |error_callback| will be called on failure with a message indicating the
   // cause.
   virtual void CreateL2capService(
       const BluetoothUUID& uuid,
       const ServiceOptions& options,
       const CreateServiceCallback& callback,
       const CreateServiceErrorCallback& error_callback) = 0;
 
  protected:
-  friend class base::RefCounted<BluetoothAdapter>;
+  friend class base::RefCountedThreadSafe<BluetoothAdapter,
+                                          BluetoothAdapterDeleter>;
+  friend struct BluetoothAdapterDeleter;
   friend class BluetoothDiscoverySession;
   BluetoothAdapter();
   virtual ~BluetoothAdapter();

[armansito, 2014/12/16 22:01:47]

nit: Empty line after destructor.

[scheib, 2014/12/16 22:15:26]

Done.

+  // Called by RefCountedThreadSafeDeleteOnCorrectThread to destroy this.
+  virtual void DeleteOnCorrectThread() const = 0;
 
   // Internal methods for initiating and terminating device discovery sessions.
   // An implementation of BluetoothAdapter keeps an internal reference count to
   // make sure that the underlying controller is constantly searching for nearby
   // devices and retrieving information from them as long as there are clients
   // who have requested discovery. These methods behave in the following way:
   //
   // On a call to AddDiscoverySession:
   //    - If there is a pending request to the subsystem, queue this request to
   //      execute once the pending requests are done.
@@ skipping 62 matching lines @@
   // will remove itself from this list when it gets destroyed or becomes
   // inactive by calling DiscoverySessionBecameInactive(), hence no pointers to
   // deallocated sessions are kept.
   std::set<BluetoothDiscoverySession*> discovery_sessions_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<BluetoothAdapter> weak_ptr_factory_;
 };
 
+// Trait for RefCountedThreadSafe that deletes BluetoothAdapter.
+struct BluetoothAdapterDeleter {
+  static void Destruct(const BluetoothAdapter* adapter) {
+    adapter->DeleteOnCorrectThread();
+  }
+};
+
 }  // namespace device
 
 #endif  // DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_H_