bluetooth: BluetoothAdapterDeleter used to control BluetoothAdapter destruction.

device/bluetooth/bluetooth_adapter_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_ADAPTER_CHROMEOS_H_
 #define DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_CHROMEOS_H_
 
 #include <queue>
 #include <string>
 
@@ skipping 26 matching lines @@
 class DEVICE_BLUETOOTH_EXPORT BluetoothAdapterChromeOS
     : public device::BluetoothAdapter,
       public chromeos::BluetoothAdapterClient::Observer,
       public chromeos::BluetoothDeviceClient::Observer,
       public chromeos::BluetoothInputClient::Observer,
       public chromeos::BluetoothAgentServiceProvider::Delegate {
  public:
   static base::WeakPtr<BluetoothAdapter> CreateAdapter();
 
   // BluetoothAdapter:
+  virtual void DeleteOnCorrectThread() const override;

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

nit: Drop "virtual" since you already specify "override". The rest of the code
violates this since it hasn't gone through a proper refactor. Let's stick to the
correct style for new code.

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

Done.

   virtual void AddObserver(
       device::BluetoothAdapter::Observer* observer) override;
   virtual void RemoveObserver(
       device::BluetoothAdapter::Observer* observer) override;
   virtual std::string GetAddress() const override;
   virtual std::string GetName() const override;
   virtual void SetName(const std::string& name,
                        const base::Closure& callback,
                        const ErrorCallback& error_callback) override;
   virtual bool IsInitialized() const override;
@@ skipping 52 matching lines @@
 
   // Returns the object path of the adapter.
   const dbus::ObjectPath& object_path() const { return object_path_; }
 
  protected:
   // BluetoothAdapter:
   virtual void RemovePairingDelegateInternal(
       device::BluetoothDevice::PairingDelegate* pairing_delegate) override;
 
  private:
+  friend class base::DeleteHelper<BluetoothAdapterChromeOS>;
   friend class BluetoothChromeOSTest;
 
   // typedef for callback parameters that are passed to AddDiscoverySession
   // and RemoveDiscoverySession. This is used to queue incoming requests while
   // a call to BlueZ is pending.
   typedef std::pair<base::Closure, ErrorCallback> DiscoveryCallbackPair;
   typedef std::queue<DiscoveryCallbackPair> DiscoveryCallbackQueue;
 
   BluetoothAdapterChromeOS();
   virtual ~BluetoothAdapterChromeOS();
@@ skipping 144 matching lines @@
   // 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<BluetoothAdapterChromeOS> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothAdapterChromeOS);
 };
 
 }  // namespace chromeos
 
 #endif  // DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_CHROMEOS_H_