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 a shutdown scenario where BluetoothAdapterChromeOS::Shutdown
+// causes IsPresent to return false just before the dbus system is shutdown but
+// while references to the BluetoothAdapterChromeOS object still exists.
+//
+// When adding methods to this class verify shutdown behavior in
+// BluetoothChromeOSTest, Shutdown.
 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;
+  friend class BluetoothChromeOSTest_Shutdown_OnStartDiscovery_Test;
+  friend class BluetoothChromeOSTest_Shutdown_OnStartDiscoveryError_Test;
+  friend class BluetoothChromeOSTest_Shutdown_OnStopDiscovery_Test;
+  friend class BluetoothChromeOSTest_Shutdown_OnStopDiscoveryError_Test;
 
   // 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 43 matching lines @@
   // Called by dbus:: on completion of the D-Bus method call to request that
   // the pairing agent be made the default.
   void OnRequestDefaultAgent();
   void OnRequestDefaultAgentError(const std::string& error_name,
                                   const std::string& error_message);
 
   // Called by BluetoothAudioSinkChromeOS on completion of registering an audio
   // 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
   // with path |object_path|. Returns the existing pairing object if the device
   // already has one (usually an outgoing connection in progress) or a new
   // pairing object with the default pairing delegate if not. If no default
   // pairing object exists, NULL will be returned.
   BluetoothPairingChromeOS* GetPairing(const dbus::ObjectPath& object_path);
 
   // Set the tracked adapter to the one in |object_path|, this object will
@@ skipping 23 matching lines @@
                                  const ErrorCallback& error_callback,
                                  bool success);
 
   // BluetoothAdapter:
   void AddDiscoverySession(const base::Closure& callback,
                            const ErrorCallback& error_callback) override;
   void RemoveDiscoverySession(const base::Closure& callback,
                               const ErrorCallback& error_callback) override;
 
   // Called by dbus:: on completion of the D-Bus method call to start discovery.
-  void OnStartDiscovery(const base::Closure& callback);
+  void OnStartDiscovery(const base::Closure& callback,
+                        const ErrorCallback& error_callback);
   void OnStartDiscoveryError(const base::Closure& callback,
                              const ErrorCallback& error_callback,
                              const std::string& error_name,
                              const std::string& error_message);
 
   // Called by dbus:: on completion of the D-Bus method call to stop discovery.
   void OnStopDiscovery(const base::Closure& callback);
   void OnStopDiscoveryError(const ErrorCallback& error_callback,
                             const std::string& error_name,
                             const std::string& error_message);
@@ skipping 60 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_