bluetooth: Modify DCHECK to conditionals in several BluetoothAdapterChromeOS methods.

device/bluetooth/bluetooth_adapter_chromeos.h

Index: device/bluetooth/bluetooth_adapter_chromeos.h
diff --git a/device/bluetooth/bluetooth_adapter_chromeos.h b/device/bluetooth/bluetooth_adapter_chromeos.h
index 12a88f9bbff9a13e1f526f28013b77773e23e2a0..467a7aa23ccba9666b075f76ecb781360734ce5c 100644
--- a/device/bluetooth/bluetooth_adapter_chromeos.h
+++ b/device/bluetooth/bluetooth_adapter_chromeos.h
@@ -41,6 +41,13 @@ class BluetoothRemoteGattServiceChromeOS;
 
 // The BluetoothAdapterChromeOS class implements BluetoothAdapter for the
 // Chrome OS platform.
+//
+// Methods tolerate a shutdown senario where BluetoothAdapterChromeOS::Shutdown

[armansito, 2015/02/19 21:40:49]

nit: s/senario/scenario/

[scheib, 2015/02/20 00:41:17]

Done.

+// caues IsPresent to return false just before the dbus system is shutdown but

[armansito, 2015/02/19 21:40:49]

nit: s/caues/causes/

[scheib, 2015/02/20 00:41:17]

Done.

+// while references to the BluetoothAdapterChromeOS object still exists.
+//
+// Add verification of shutdown behavior to BluetoothChromeOSTest Shutdown
+// for all new methods.

[armansito, 2015/02/19 21:40:49]

nit: Is this last sentence a TODO?

[scheib, 2015/02/20 00:41:17]

Reworded as maintenance instructions.

 class DEVICE_BLUETOOTH_EXPORT BluetoothAdapterChromeOS
     : public device::BluetoothAdapter,
       public chromeos::BluetoothAdapterClient::Observer,
@@ -149,6 +156,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAdapterChromeOS
  private:
   friend class base::DeleteHelper<BluetoothAdapterChromeOS>;
   friend class BluetoothChromeOSTest;
+  friend class BluetoothChromeOSTest_Shutdown_Test;
 
   // typedef for callback parameters that are passed to AddDiscoverySession
   // and RemoveDiscoverySession. This is used to queue incoming requests while
@@ -212,6 +220,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAdapterChromeOS
   // sink.
   void OnRegisterAudioSink(
       const device::BluetoothAdapter::AcquiredCallback& callback,
+      const device::BluetoothAudioSink::ErrorCallback& error_callback,
       scoped_refptr<device::BluetoothAudioSink> audio_sink);
 
   // Internal method to obtain a BluetoothPairingChromeOS object for the device