D-Bus: ObjectProxy remove function for Bus object.

dbus/bus.cc

 // Copyright (c) 2012 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.
 //
 // TODO(satorux):
 // - Handle "disconnected" signal.
 
 #include "dbus/bus.h"
 
 #include "base/bind.h"
@@ skipping 217 matching lines @@
     return iter->second;
   }
 
   scoped_refptr<ObjectProxy> object_proxy =
       new ObjectProxy(this, service_name, object_path, options);
   object_proxy_table_[key] = object_proxy;
 
   return object_proxy.get();
 }
 
+void Bus::RemoveObjectProxy(const std::string& service_name,
+                            const ObjectPath& object_path) {
+  RemoveObjectProxyWithOptions(service_name, object_path,
+                               ObjectProxy::DEFAULT_OPTIONS);
+}
+
+void Bus::RemoveObjectProxyWithOptions(const std::string& service_name,
+                                       const dbus::ObjectPath& object_path,
+                                       int options) {
+  AssertOnOriginThread();
+
+  // Check if we have the requested object proxy.
+  const ObjectProxyTable::key_type key(service_name + object_path.value(),
+                                       options);
+  ObjectProxyTable::iterator iter = object_proxy_table_.find(key);
+  if (iter != object_proxy_table_.end()) {
+    // Detach and erase
+    iter->second.get()->Detach();

[satorux1, 2013/01/18 17:32:40]

You cannot all Detach() here, as Detach() should be called on the D-Bus thread.
You can do something like

PostTaskToDBusThread(
    FROM_HERE,
    base::Bind(&ObjectProxy::Detach, its->second.get()));

This will call Detach on the D-Bus thread, but the caller cannot tell when it's
done.

I think RemoveObjectProxy* should take a callback like:

void Bus::RemoveObjectProxy(...,
                            RemoveObjectProxyCallback callback);

Then, the caller can tell when the remove is done.

We are doing something similar in RequestOwnership(). Looking at the code,
OnOwnership() function looks unnecessary:

BEFORE:

  PostTaskToOriginThread(FROM_HERE,
                         base::Bind(&Bus::OnOwnership,
                                    this,
                                    on_ownership_callback,
                                    service_name,
                                    success));

AFTER:

  PostTaskToOriginThread(FROM_HERE,
                         base::Bind(on_ownership_callback,
                                    service_name,
                                    success));

This should work.

+    object_proxy_table_.erase(iter);
+  }
+}
+
 ExportedObject* Bus::GetExportedObject(const ObjectPath& object_path) {
   AssertOnOriginThread();
 
   // Check if we already have the requested exported object.
   ExportedObjectTable::iterator iter = exported_object_table_.find(object_path);
   if (iter != exported_object_table_.end()) {
     return iter->second;
   }
 
   scoped_refptr<ExportedObject> exported_object =
@@ skipping 595 matching lines @@
 }
 
 void Bus::OnDispatchStatusChangedThunk(DBusConnection* connection,
                                        DBusDispatchStatus status,
                                        void* data) {
   Bus* self = static_cast<Bus*>(data);
   self->OnDispatchStatusChanged(connection, status);
 }
 
 }  // namespace dbus