device/bluetooth: Implement Unregister() of BlueotoothAudioSinkChromeOS and disconnection-related c…

device/bluetooth/bluetooth_audio_sink_chromeos.h

 // Copyright 2015 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_AUDIO_SINK_CHROMEOS_H_
 #define DEVICE_BLUETOOTH_BLUETOOTH_AUDIO_SINK_CHROMEOS_H_
 
 #include <stdint.h>
 #include <string>
 #include <vector>
@@ skipping 21 matching lines @@
       public BluetoothMediaTransportClient::Observer,
       public BluetoothMediaEndpointServiceProvider::Delegate {
  public:
   explicit BluetoothAudioSinkChromeOS(
       scoped_refptr<device::BluetoothAdapter> adapter);
 
   // device::BluetoothAudioSink overrides.
   // Unregisters a BluetoothAudioSink. |callback| should handle
   // the clean-up after the audio sink is deleted successfully, otherwise
   // |error_callback| will be called.
-  void Unregister(
-      const base::Closure& callback,
-      const device::BluetoothAudioSink::ErrorCallback& error_callback) override;
+  void Unregister(const base::Closure& callback) override;

[Ben Chan, 2015/02/19 00:21:45]

comment needs updated

[Miao, 2015/02/23 21:04:25]

Recovered the error callback, so the the comment stays valid.

   void AddObserver(BluetoothAudioSink::Observer* observer) override;
   void RemoveObserver(BluetoothAudioSink::Observer* observer) override;
   device::BluetoothAudioSink::State GetState() const override;
   uint16_t GetVolume() const override;
 
   // device::BluetoothAdapter::Observer overrides.
   void AdapterPresentChanged(device::BluetoothAdapter* adapter,
                              bool present) override;
+  void AdapterPoweredChanged(device::BluetoothAdapter* adapter,
+                             bool powered) override;
 
   // BluetoothMediaClient::Observer overrides.
   void MediaRemoved(const dbus::ObjectPath& object_path) override;
 
   // BluetoothMediaTransportClient::Observer overrides.
   void MediaTransportRemoved(const dbus::ObjectPath& object_path) override;
   void MediaTransportPropertyChanged(const dbus::ObjectPath& object_path,
                                      const std::string& property_name) override;
 
   // BluetoothMediaEndpointServiceProvider::Delegate overrides.
@@ skipping 25 matching lines @@
   void StateChanged(device::BluetoothAudioSink::State state);
 
   // Called when the volume property of BluetoothMediaTransport has been
   // updated.
   void VolumeChanged(uint16_t volume);
 
   // Called when the registration of Media Endpoint has succeeded.
   void OnRegisterSucceeded(const base::Closure& callback);
 
   // Called when the registration of Media Endpoint failed.
-  void OnRegisterFailed(const BluetoothAudioSink::ErrorCallback& error_callback,
-                        const std::string& error_name,
-                        const std::string& error_message);
+  void OnRegisterFailed(
+      const device::BluetoothAudioSink::ErrorCallback& error_callback,
+      const std::string& error_name,
+      const std::string& error_message);
+
+  // Called when the unregistration of Media Endpoint has succeeded. The
+  // clean-up of media, media transport and media endpoint will be handled here.
+  void OnUnregisterSucceeded(const base::Closure& callback);
+
+  // Called when the unregistration of Media Endpoint failed.
+  void OnUnregisterFailed(const std::string& error_name,
+                          const std::string& error_message);
 
   // Reads from the file descriptor acquired via Media Transport object and
   // notify |observer_| while the audio data is available.
   void ReadFromFD();
 
   // Helper functions to clean up media, media transport and media endpoint.
   // Called when the |state_| changes to either STATE_INVALID or
   // STATE_DISCONNECTED.
   void ResetMedia();
   void ResetTransport();
   void ResetEndpoint();
 
   // The connection state between the BluetoothAudioSinkChromeOS and the remote
   // device.
   device::BluetoothAudioSink::State state_;
 
   // The volume control by the remote device during the streaming.
-  uint16_t volume_;
+  scoped_ptr<uint16_t> volume_;
 
   // Read MTU of the file descriptor acquired via Media Transport object.
-  uint16_t read_mtu_;
+  scoped_ptr<uint16_t> read_mtu_;
 
   // Write MTU of the file descriptor acquired via Media Transport object.
-  uint16_t write_mtu_;
+  scoped_ptr<uint16_t> write_mtu_;
 
   // File descriptor acquired via Media Transport object.
   dbus::FileDescriptor fd_;
 
   // Object path of the media object being used.
   dbus::ObjectPath media_path_;
 
   // Object path of the transport object being used.
   dbus::ObjectPath transport_path_;
 
@@ skipping 18 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<BluetoothAudioSinkChromeOS> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothAudioSinkChromeOS);
 };
 
 }  // namespace chromeos
 
 #endif  // DEVICE_BLUETOOTH_BLUETOOTH_AUDIO_SINK_CHROMEOS_H_