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

device/bluetooth/bluetooth_audio_sink_chromeos.h

Index: device/bluetooth/bluetooth_audio_sink_chromeos.h
diff --git a/device/bluetooth/bluetooth_audio_sink_chromeos.h b/device/bluetooth/bluetooth_audio_sink_chromeos.h
index 3af285b68732b2f87083c9426214dcc2c46c527c..0ba5d71d19be7c066f6bda69cb3f8de3f2fe27b8 100644
--- a/device/bluetooth/bluetooth_audio_sink_chromeos.h
+++ b/device/bluetooth/bluetooth_audio_sink_chromeos.h
@@ -50,6 +50,8 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAudioSinkChromeOS
   // 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;
@@ -95,9 +97,24 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAudioSinkChromeOS
   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 device::BluetoothAudioSink::ErrorCallback& error_callback,
+      const std::string& error_name,
+      const std::string& error_message);
+
+  // A dummy error callback for calling Unregister() in destructor.
+  void UnregisterErrorCallback(
+      device::BluetoothAudioSink::ErrorCode error_code);

[armansito, 2015/02/23 22:07:06]

if this is a dummy then why does it need to be a class method?

[Miao, 2015/02/24 01:12:13]

Moved it to anonymous namespace.

 
   // Reads from the file descriptor acquired via Media Transport object and
   // notify |observer_| while the audio data is available.
@@ -115,13 +132,13 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAudioSinkChromeOS
   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_;