device/bluetooth:Implement BluetoothMediaEndpointServiceProvider delegate and media-related overrid…

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 37994d3019c1b92f1b180c8505b2ae6a124d5f9c..7685da7692862b6cc7a43f8f8face3a87097fc8d 100644
--- a/device/bluetooth/bluetooth_audio_sink_chromeos.h
+++ b/device/bluetooth/bluetooth_audio_sink_chromeos.h
@@ -23,6 +23,8 @@
 
 namespace chromeos {
 
+class BluetoothAudioSinkChromeOSTest;
+
 class DEVICE_BLUETOOTH_EXPORT BluetoothAudioSinkChromeOS
     : public device::BluetoothAudioSink,
       public device::BluetoothAdapter::Observer,
@@ -34,6 +36,12 @@ class DEVICE_BLUETOOTH_EXPORT 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 AddObserver(BluetoothAudioSink::Observer* observer) override;
   void RemoveObserver(BluetoothAudioSink::Observer* observer) override;
   device::BluetoothAudioSink::State GetState() const override;
@@ -53,12 +61,12 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAudioSinkChromeOS
 
   // BluetoothMediaEndpointServiceProvider::Delegate overrides.
   void SetConfiguration(const dbus::ObjectPath& transport_path,
-                        const dbus::MessageReader& properties) override;
+                        const TransportProperties& properties) override;
   void SelectConfiguration(
       const std::vector<uint8_t>& capabilities,
       const SelectConfigurationCallback& callback) override;
   void ClearConfiguration(const dbus::ObjectPath& transport_path) override;
-  void Release() override;
+  void Released() override;
 
   // Registers a BluetoothAudioSink. User applications can use |options| to
   // configure the audio sink. |callback| will be executed if the audio sink is
@@ -69,12 +77,9 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAudioSinkChromeOS
       const base::Closure& callback,
       const device::BluetoothAudioSink::ErrorCallback& error_callback);
 
-  // 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;
+  // Returns a pointer to the media endpoint object. This function should be
+  // used for testing purpose only.
+  BluetoothMediaEndpointServiceProvider* GetEndpointServiceProvider();
 
  private:
   ~BluetoothAudioSinkChromeOS() override;
@@ -98,6 +103,13 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAudioSinkChromeOS
   // notify |observer_| while the audio data is available.
   void ReadFromFD();
 
+  // Helper functions to clean up media, media transport and media endpoint.
+  // Called while the |state_| changes to either STATE_INVAILD or

[armansito, 2015/02/10 00:17:02]

nit: s/Called while/Called when/
nit: s/STATE_INVAILD/STATE_INVALID/

[Miao, 2015/02/10 22:15:21]

Done.

+  // STATE_DISCONNECTED.
+  void ResetMedia();
+  void ResetTransport();
+  void ResetEndpoint();
+
   // The connection state between the BluetoothAudioSinkChromeOS and the remote
   // device.
   device::BluetoothAudioSink::State state_;