bluetooth: Modify DCHECK to conditionals in several BluetoothAdapterChromeOS methods.

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 <map>
 #include <queue>
 #include <string>
@@ skipping 23 matching lines @@
 class BluetoothChromeOSTest;
 class BluetoothAdapterProfileChromeOS;
 class BluetoothDeviceChromeOS;
 class BluetoothPairingChromeOS;
 class BluetoothRemoteGattCharacteristicChromeOS;
 class BluetoothRemoteGattDescriptorChromeOS;
 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,
       public chromeos::BluetoothDeviceClient::Observer,
       public chromeos::BluetoothInputClient::Observer,
       public chromeos::BluetoothAgentServiceProvider::Delegate {
  public:
   typedef base::Callback<void(const std::string& error_message)>
       ErrorCompletionCallback;
   typedef base::Callback<void(BluetoothAdapterProfileChromeOS* profile)>
@@ skipping 88 matching lines @@
   void ReleaseProfile(const device::BluetoothUUID& uuid);
 
  protected:
   // BluetoothAdapter:
   void RemovePairingDelegateInternal(
       device::BluetoothDevice::PairingDelegate* pairing_delegate) override;
 
  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
   // a call to BlueZ is pending.
   typedef std::pair<base::Closure, ErrorCallback> DiscoveryCallbackPair;
   typedef std::queue<DiscoveryCallbackPair> DiscoveryCallbackQueue;
 
   BluetoothAdapterChromeOS();
   ~BluetoothAdapterChromeOS() override;
 
@@ skipping 167 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_