bluetooth: BluetoothAdapterDeleter used to control BluetoothAdapter destruction.

device/bluetooth/bluetooth_adapter_win.h

Index: device/bluetooth/bluetooth_adapter_win.h
diff --git a/device/bluetooth/bluetooth_adapter_win.h b/device/bluetooth/bluetooth_adapter_win.h
index 7d1912566458e28b4a777a9fc6c616cc8b11fc90..33de451295b5bcbcb7b49ae7d690e2b6acd6e383 100644
--- a/device/bluetooth/bluetooth_adapter_win.h
+++ b/device/bluetooth/bluetooth_adapter_win.h
@@ -89,6 +89,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAdapterWin
       device::BluetoothDevice::PairingDelegate* pairing_delegate) override;
 
  private:
+  friend class base::DeleteHelper<BluetoothAdapterWin>;
   friend class BluetoothAdapterWinTest;
 
   enum DiscoveryStatus {
@@ -102,6 +103,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAdapterWin
   virtual ~BluetoothAdapterWin();
 
   // BluetoothAdapter:
+  virtual void DeleteOnCorrectThread() const { delete this; }

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

Drop virtual, add override. Also, why does this method have a definition? You
added one to bluetooth_adapter_win.cc already.

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

Done. Thanks, blatant error.

   virtual void AddDiscoverySession(
       const base::Closure& callback,
       const ErrorCallback& error_callback) override;