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();
 }
 
+bool Bus::RemoveObjectProxy(const std::string& service_name,
+                            const ObjectPath& object_path,
+                            OnRemoveObjectProxyCallback callback) {
+  return RemoveObjectProxyWithOptions(service_name, object_path,
+                                      ObjectProxy::DEFAULT_OPTIONS,
+                                      callback);
+}
+
+bool Bus::RemoveObjectProxyWithOptions(const std::string& service_name,
+                                       const dbus::ObjectPath& object_path,
+                                       int options,
+                                       OnRemoveObjectProxyCallback callback) {
+  bool result;
+  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()) {
+    // Object is present. Remove it now and Detach in the DBus thread.
+    result = true;
+    PostTaskToDBusThread(FROM_HERE, base::Bind(
+        &Bus::RemoveObjectProxyInternal,
+        this, iter->second, service_name, object_path, options, callback));
+
+    object_proxy_table_.erase(iter);
+  } else {

[Haruki Sato, 2013/01/23 09:34:05]

maybe returns in this if clause make it simpler?
e.g.
if (...) {
  ...
  return true;
}
return false;

[deymo, 2013/01/23 19:23:46]

Done.

+    result = false;
+  }
+  return result;
+}
+
+void Bus::RemoveObjectProxyInternal(
+    scoped_refptr<dbus::ObjectProxy> object_proxy,
+    const std::string& service_name,
+    const dbus::ObjectPath& object_path,
+    int options,
+    OnRemoveObjectProxyCallback callback) {
+  AssertOnDBusThread();
+
+  object_proxy.get()->Detach();
+
+  PostTaskToOriginThread(FROM_HERE,
+                         base::Bind(&Bus::OnRemoveObjectProxy,
+                                    this,
+                                    callback,
+                                    service_name,
+                                    object_path,
+                                    options));
+}
+
+void Bus::OnRemoveObjectProxy(OnRemoveObjectProxyCallback callback,
+                              const std::string& service_name,
+                              const dbus::ObjectPath& object_path,
+                              int options) {
+  AssertOnOriginThread();
+
+  callback.Run(service_name, object_path, options);
+}
+
 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