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

chromeos/dbus/fake_bluetooth_media_transport_client.cc

Index: chromeos/dbus/fake_bluetooth_media_transport_client.cc
diff --git a/chromeos/dbus/fake_bluetooth_media_transport_client.cc b/chromeos/dbus/fake_bluetooth_media_transport_client.cc
index 26fb832d431df651c0e8ae47cb248e6ffec021cb..2289670e8b0a8abc7eb6e17fa0e361200a636098 100644
--- a/chromeos/dbus/fake_bluetooth_media_transport_client.cc
+++ b/chromeos/dbus/fake_bluetooth_media_transport_client.cc
@@ -4,10 +4,15 @@
 
 #include "chromeos/dbus/fake_bluetooth_media_transport_client.h"
 
+#include <sstream>
+
 #include "base/bind.h"
+#include "base/stl_util.h"
 #include "chromeos/dbus/bluetooth_media_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/fake_bluetooth_adapter_client.h"
 #include "chromeos/dbus/fake_bluetooth_media_client.h"
+#include "chromeos/dbus/fake_bluetooth_media_endpoint_service_provider.h"
 
 using dbus::ObjectPath;
 
@@ -17,21 +22,29 @@ namespace {
 const char kBluetoothMediaTransportInterface[] = "org.bluez.MediaTransport1";
 const char kNotImplemented[] = "org.bluez.NotImplemented";
 
+ObjectPath GenerateTransportPath() {
+  static unsigned int sequence_number = 0;
+  ++sequence_number;
+  std::stringstream path;
+  path << chromeos::FakeBluetoothAdapterClient::kAdapterPath
+       << chromeos::FakeBluetoothMediaTransportClient::kTransportDevicePath
+       << "/fd" << sequence_number;
+  return ObjectPath(path.str());
+}
+
 }  // namespace
 
 namespace chromeos {
 
 // static
-const char FakeBluetoothMediaTransportClient::kTransportPath[] =
-    "/fake/hci0/dev_00_00_00_00_00_00/fd0";
 const char FakeBluetoothMediaTransportClient::kTransportDevicePath[] =
-    "/fake/hci0/dev_00_00_00_00_00_00";
+    "/fake_audio_source";
 const uint8_t FakeBluetoothMediaTransportClient::kTransportCodec = 0x00;
 const std::vector<uint8_t>
     FakeBluetoothMediaTransportClient::kTransportConfiguration = {
         0x21, 0x15, 0x33, 0x2C};
 const uint16_t FakeBluetoothMediaTransportClient::kTransportDelay = 5;
-const uint16_t FakeBluetoothMediaTransportClient::kTransportVolume = 10;
+const uint16_t FakeBluetoothMediaTransportClient::kTransportVolume = 50;
 
 FakeBluetoothMediaTransportClient::Properties::Properties(
     const PropertyChangedCallback& callback)
@@ -44,8 +57,6 @@ FakeBluetoothMediaTransportClient::Properties::Properties(
 FakeBluetoothMediaTransportClient::Properties::~Properties() {
 }
 
-// dbus::PropertySet overrides.
-
 void FakeBluetoothMediaTransportClient::Properties::Get(
     dbus::PropertyBase* property,
     dbus::PropertySet::GetCallback callback) {
@@ -64,34 +75,31 @@ void FakeBluetoothMediaTransportClient::Properties::Set(
   callback.Run(false);
 }
 
-FakeBluetoothMediaTransportClient::FakeBluetoothMediaTransportClient()
-    : object_path_(ObjectPath(kTransportPath)) {
-  // TODO(mcchou): Multiple endpoints are sharing one property set for now.
-  // Add property sets accordingly to separate the
-  // MediaTransportPropertiesChanged events for different endpoints.
+FakeBluetoothMediaTransportClient::Transport::Transport(
+    const ObjectPath& transport_path,
+    Properties* transport_properties)
+    : path(transport_path) {
+  properties.reset(transport_properties);
+}
+
+FakeBluetoothMediaTransportClient::Transport::~Transport() {
+}
 
-  // Sets fake property set with default values.
-  properties_.reset(new Properties(
-      base::Bind(&FakeBluetoothMediaTransportClient::OnPropertyChanged,
-                 base::Unretained(this))));
-  properties_->device.ReplaceValue(ObjectPath(kTransportDevicePath));
-  properties_->uuid.ReplaceValue(BluetoothMediaClient::kBluetoothAudioSinkUUID);
-  properties_->codec.ReplaceValue(kTransportCodec);
-  properties_->configuration.ReplaceValue(kTransportConfiguration);
-  properties_->state.ReplaceValue(BluetoothMediaTransportClient::kStateIdle);
-  properties_->delay.ReplaceValue(kTransportDelay);
-  properties_->volume.ReplaceValue(kTransportVolume);
+FakeBluetoothMediaTransportClient::FakeBluetoothMediaTransportClient() {
 }
 
 FakeBluetoothMediaTransportClient::~FakeBluetoothMediaTransportClient() {
+  for (std::map<ObjectPath, Transport*>::iterator it =
+           endpoint_to_transport_map_.begin();
+       it != endpoint_to_transport_map_.end(); ++it)
+    delete it->second;

[armansito, 2015/02/26 04:23:08]

for (auto& it : endpoint_to_transport_map_)
  delete it.second;

[Miao, 2015/02/26 04:41:50]

That's a neat one.

+  endpoint_to_transport_map_.clear();
 }
 
 // DBusClient override.
 void FakeBluetoothMediaTransportClient::Init(dbus::Bus* bus) {
 }
 
-// BluetoothMediaTransportClient overrides.
-
 void FakeBluetoothMediaTransportClient::AddObserver(
     BluetoothMediaTransportClient::Observer* observer) {
   observers_.AddObserver(observer);
@@ -105,7 +113,11 @@ void FakeBluetoothMediaTransportClient::RemoveObserver(
 FakeBluetoothMediaTransportClient::Properties*
     FakeBluetoothMediaTransportClient::GetProperties(
         const ObjectPath& object_path) {
-  return nullptr;
+  ObjectPath endpoint_path = GetEndpointPath(object_path);
+  if (endpoint_path.value() == "" ||

[armansito, 2015/02/26 04:23:08]

Replace 'endpoint_path.value() == ""' with

  endpoint_path.value().empty()

or even better:

  !endpoint_path.IsValid()

[Miao, 2015/02/26 04:41:50]

Done.

+      !ContainsKey(endpoint_to_transport_map_, endpoint_path))
+    return nullptr;
+  return endpoint_to_transport_map_[endpoint_path]->properties.get();
 }
 
 void FakeBluetoothMediaTransportClient::Acquire(
@@ -130,20 +142,93 @@ void FakeBluetoothMediaTransportClient::Release(
 }
 
 void FakeBluetoothMediaTransportClient::SetValid(
-    const ObjectPath& endpoint_path,
+    FakeBluetoothMediaEndpointServiceProvider* endpoint,
     bool valid) {
+  FakeBluetoothMediaClient* media = static_cast<FakeBluetoothMediaClient*>(
+      DBusThreadManager::Get()->GetBluetoothMediaClient());
+  DCHECK(media);
+
+  ObjectPath endpoint_path(endpoint->object_path());
+  if (!media->IsRegistered(endpoint_path))
+    return;
+
   if (valid) {
-    endpoints_[endpoint_path] = valid;
+    ObjectPath transport_path = GenerateTransportPath();
+    VLOG(1) << "New transport, " << transport_path.value()
+            << " is created for endpoint " << endpoint_path.value();
+
+    // Sets the fake property set with default values.
+    scoped_ptr<Properties> properties(new Properties(
+        base::Bind(&FakeBluetoothMediaTransportClient::OnPropertyChanged,
+                   base::Unretained(this))));
+    properties->device.ReplaceValue(ObjectPath(kTransportDevicePath));
+    properties->uuid.ReplaceValue(
+        BluetoothMediaClient::kBluetoothAudioSinkUUID);
+    properties->codec.ReplaceValue(kTransportCodec);
+    properties->configuration.ReplaceValue(kTransportConfiguration);
+    properties->state.ReplaceValue(BluetoothMediaTransportClient::kStateIdle);
+    properties->delay.ReplaceValue(kTransportDelay);
+    properties->volume.ReplaceValue(kTransportVolume);
+
+    endpoint_to_transport_map_[endpoint_path] =
+        new Transport(transport_path, properties.release());
+    transport_to_endpoint_map_[transport_path] = endpoint_path;
     return;
   }
-  endpoints_.erase(endpoint_path);
 
-  // TODO(mcchou): Since there is only one transport path, all observers will
-  // be notified. Shades irrelevant observers.
+  if (!ContainsKey(endpoint_to_transport_map_, endpoint_path))
+    return;
 
   // Notifies observers about the state change of the transport.
   FOR_EACH_OBSERVER(BluetoothMediaTransportClient::Observer, observers_,
-                    MediaTransportRemoved(object_path_));
+                    MediaTransportRemoved(GetTransportPath(endpoint_path)));
+
+  endpoint->ClearConfiguration(GetTransportPath(endpoint_path));
+  transport_to_endpoint_map_.erase(GetTransportPath(endpoint_path));
+  delete endpoint_to_transport_map_[endpoint_path];
+  endpoint_to_transport_map_.erase(endpoint_path);
+}
+
+void FakeBluetoothMediaTransportClient::SetState(
+    const dbus::ObjectPath& endpoint_path,
+    const std::string& state) {
+  if (!ContainsKey(endpoint_to_transport_map_, endpoint_path))
+    return;
+
+  endpoint_to_transport_map_[endpoint_path]
+      ->properties->state.ReplaceValue(state);
+  FOR_EACH_OBSERVER(BluetoothMediaTransportClient::Observer, observers_,
+                    MediaTransportPropertyChanged(
+                        GetTransportPath(endpoint_path),
+                        BluetoothMediaTransportClient::kStateProperty));
+}
+
+void FakeBluetoothMediaTransportClient::SetVolume(
+    const dbus::ObjectPath& endpoint_path,
+    const uint16_t& volume) {
+  if (!ContainsKey(endpoint_to_transport_map_, endpoint_path))
+    return;
+
+  endpoint_to_transport_map_[endpoint_path]->properties->volume.ReplaceValue(
+      volume);
+  FOR_EACH_OBSERVER(BluetoothMediaTransportClient::Observer, observers_,
+                    MediaTransportPropertyChanged(
+                        GetTransportPath(endpoint_path),
+                        BluetoothMediaTransportClient::kVolumeProperty));
+}
+
+ObjectPath FakeBluetoothMediaTransportClient::GetTransportPath(
+    const ObjectPath& endpoint_path) {
+  if (ContainsKey(endpoint_to_transport_map_, endpoint_path))
+    return endpoint_to_transport_map_[endpoint_path]->path;
+  return ObjectPath("");
+}
+
+ObjectPath FakeBluetoothMediaTransportClient::GetEndpointPath(
+    const ObjectPath& transport_path) {
+  if (ContainsKey(transport_to_endpoint_map_, transport_path))
+    return transport_to_endpoint_map_[transport_path];
+  return ObjectPath("");
 }
 
 void FakeBluetoothMediaTransportClient::OnPropertyChanged(