device/bluetooth:Implement Register() for BluetoothAudioSinkChromeOS.

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 3f9f839ddaebea0fd2e287be735849aa6ef202f1..8019c15990ab40e3423ea3f440c39fd45fc1927b 100644
--- a/device/bluetooth/bluetooth_audio_sink_chromeos.h
+++ b/device/bluetooth/bluetooth_audio_sink_chromeos.h
@@ -18,12 +18,13 @@
 #include "dbus/file_descriptor.h"
 #include "dbus/object_path.h"
 #include "device/bluetooth/bluetooth_adapter.h"
-#include "device/bluetooth/bluetooth_adapter_chromeos.h"
 #include "device/bluetooth/bluetooth_audio_sink.h"
 #include "device/bluetooth/bluetooth_export.h"
 
 namespace chromeos {
 
+class BluetoothAdapterChromeOS;
+
 class DEVICE_BLUETOOTH_EXPORT BluetoothAudioSinkChromeOS
     : public device::BluetoothAudioSink,
       public device::BluetoothAdapter::Observer,
@@ -31,7 +32,8 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAudioSinkChromeOS
       public BluetoothMediaTransportClient::Observer,
       public BluetoothMediaEndpointServiceProvider::Delegate {
  public:
-  explicit BluetoothAudioSinkChromeOS(BluetoothAdapterChromeOS* adapter);
+  explicit BluetoothAudioSinkChromeOS(
+      scoped_refptr<BluetoothAdapterChromeOS> adapter);

[armansito, 2015/01/29 04:22:56]

Strange that this works. BluetoothAdapterChromeOS doesn't inherit from
base::RefCounted<BluetoothAdapterChromeOS>. So, shouldn't this be a
scoped_refptr<BluetoothAdapter> or is this OK somehow?

[Miao, 2015/01/29 23:58:38]

It passed the compilation, and it looks like the unittest passed as well.
But you're right. I should change it to the superclass.

 
   // device::BluetoothAudioSink overrides.
   void AddObserver(BluetoothAudioSink::Observer* observer) override;
@@ -42,8 +44,6 @@ 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;
@@ -88,6 +88,14 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAudioSinkChromeOS
   // 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);
+
   // Reads from the file descriptor acquired via Media Transport object and
   // notify |observer_| while the audio data is available.
   void ReadFromFD();
@@ -96,12 +104,6 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAudioSinkChromeOS
   // device.
   device::BluetoothAudioSink::State state_;
 
-  // Indicates whether the adapter is present.
-  bool present_;
-
-  // Indicates whether the adapter is powered.
-  bool powered_;
-
   // The volume control by the remote device during the streaming.
   uint16_t volume_;
 
@@ -125,7 +127,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothAudioSinkChromeOS
 
   // BT adapter which the audio sink binds to. |adapter_| should outlive
   // a BluetoothAudioSinkChromeOS object.
-  BluetoothAdapterChromeOS* adapter_;
+  scoped_refptr<BluetoothAdapterChromeOS> adapter_;
 
   // Options used to initiate Media Endpoint and select configuration for the
   // transport.