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..00eb02f6ec6abb252a9ce08ba9c44204f18f3e41 100644
--- a/device/bluetooth/bluetooth_adapter_chromeos.h
+++ b/device/bluetooth/bluetooth_adapter_chromeos.h
@@ -41,6 +41,10 @@ class BluetoothRemoteGattServiceChromeOS;
 
 // The BluetoothAdapterChromeOS class implements BluetoothAdapter for the
 // Chrome OS platform.
+//
+// Methods tolerate the dbus system being before the BluetoothAdapterChromeOS

[armansito, 2015/02/19 01:44:47]

nit: '...dbus system being _shutdown_ before the...'?

[scheib, 2015/02/19 21:34:15]

Done.

+// object is destroyed. This is signaled by Shutdown() and IsPresent will be
+// false. BluetoothChromeOSTest Shutdown should include all methods.
 class DEVICE_BLUETOOTH_EXPORT BluetoothAdapterChromeOS
     : public device::BluetoothAdapter,
       public chromeos::BluetoothAdapterClient::Observer,
@@ -149,6 +153,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAdapterChromeOS
  private:
   friend class base::DeleteHelper<BluetoothAdapterChromeOS>;
   friend class BluetoothChromeOSTest;
+  friend class BluetoothChromeOSTest_Shutdown_Test;

[armansito, 2015/02/19 01:44:47]

Is this necessary? I thought the friendship above would be enough, though I may
be wrong.

[scheib, 2015/02/19 21:34:15]

Yes, the previous friend only applies to the fixture. A subclass of the fixture
is made for each test, and it doesn't have friend status.

It is possible to have a single friend listed here by adding wrappers for every
call to the test fixture and calling those from a test instead of directly on
the adapter, but for so many methods that's too much plumbing vs just adding
another friend line per test that needs it.

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

sgtm

 
   // typedef for callback parameters that are passed to AddDiscoverySession
   // and RemoveDiscoverySession. This is used to queue incoming requests while