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

chromeos/dbus/fake_bluetooth_media_client.cc

 // Copyright 2014 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.
 
 #include "chromeos/dbus/fake_bluetooth_media_client.h"
 
 #include <string>
 
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_bluetooth_adapter_client.h"
@@ skipping 62 matching lines @@
 
   callback.Run();
 }
 
 void FakeBluetoothMediaClient::UnregisterEndpoint(
     const ObjectPath& object_path,
     const ObjectPath& endpoint_path,
     const base::Closure& callback,
     const ErrorCallback& error_callback) {
   // TODO(mcchou): Come up with some corresponding actions.
-  error_callback.Run(kFailedError, "");
+  VLOG(1) << "UnregisterEndpoint: " << endpoint_path.value();
+
+  if (endpoints_.find(endpoint_path) == endpoints_.end()) {

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

see ContainsKey in src/base/stl_util.h 

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

Done.

+    error_callback.Run(kFailedError, "Unknown media endpoint");
+    return;
+  }
+
+  SetEndpointRegistered(endpoint_path, false);
+  callback.Run();
 }
 
 void FakeBluetoothMediaClient::SetVisible(bool visible) {
   visible_ = visible;
 
   if (visible_)
     return;
 
   // If the media object becomes invisible, an update chain will
   // unregister all endpoints and set the associated transport
   // objects to be invalid.
   for (std::map<ObjectPath, bool>::iterator it = endpoints_.begin();
        it != endpoints_.end(); ++it) {
     SetEndpointRegistered(it->first, false);
   }
+
   endpoints_.clear();
 
   // Notifies observers about the change on |visible_|.
   FOR_EACH_OBSERVER(BluetoothMediaClient::Observer, observers_,
                     MediaRemoved(object_path_));
 }
 
 void FakeBluetoothMediaClient::SetEndpointRegistered(
     const ObjectPath& endpoint_path,
     bool registered) {
   if (registered) {
     endpoints_[endpoint_path] = registered;

[armansito, 2015/02/19 00:37:46]

Do an early return here.

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

Done.

   } else {
     // Once a media endpoint object becomes invalid, the associated transport
     // becomes invalid.
     FakeBluetoothMediaTransportClient* transport =
         static_cast<FakeBluetoothMediaTransportClient*>(
             DBusThreadManager::Get()->GetBluetoothMediaTransportClient());
-    transport->SetValid(endpoint_path, true);
+    transport->SetValid(endpoint_path, false);
   }
 }
 
 }  // namespace chromeos