dbus: allow unregistering of exported objects

chrome/browser/chromeos/dbus/bluetooth_agent_service_provider.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.
 
 #include "chrome/browser/chromeos/dbus/bluetooth_agent_service_provider.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 19 matching lines @@
 
 // The BluetoothAgentServiceProvider implementation used in production.
 class BluetoothAgentServiceProviderImpl : public BluetoothAgentServiceProvider {
  public:
   BluetoothAgentServiceProviderImpl(dbus::Bus* bus,
                                     const dbus::ObjectPath& object_path,
                                     Delegate* delegate)
       : weak_ptr_factory_(this),
         origin_thread_id_(base::PlatformThread::CurrentId()),
         bus_(bus),
-        delegate_(delegate) {
+        delegate_(delegate),
+        object_path_(object_path) {
     DVLOG(1) << "Creating BluetoothAdapterClientImpl for "
              << object_path.value();
 
-    exported_object_ = bus_->GetExportedObject(object_path);
+    exported_object_ = bus_->GetExportedObject(object_path_);
 
     exported_object_->ExportMethod(
         bluetooth_agent::kBluetoothAgentInterface,
         bluetooth_agent::kRelease,
         base::Bind(&BluetoothAgentServiceProviderImpl::Release,
                    weak_ptr_factory_.GetWeakPtr()),
         base::Bind(&BluetoothAgentServiceProviderImpl::ReleaseExported,
                    weak_ptr_factory_.GetWeakPtr()));
 
     exported_object_->ExportMethod(
@@ skipping 57 matching lines @@
     exported_object_->ExportMethod(
         bluetooth_agent::kBluetoothAgentInterface,
         bluetooth_agent::kCancel,
         base::Bind(&BluetoothAgentServiceProviderImpl::Cancel,
                    weak_ptr_factory_.GetWeakPtr()),
         base::Bind(&BluetoothAgentServiceProviderImpl::CancelExported,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
   virtual ~BluetoothAgentServiceProviderImpl() {
+    // Unregister the object path so we can reuse with a new agent.
+    bus_->UnregisterExportedObject(object_path_);
   }
 
  private:
   // Returns true if the current thread is on the origin thread.
   bool OnOriginThread() {
     return base::PlatformThread::CurrentId() == origin_thread_id_;
   }
 
   // Called by dbus:: when the agent is unregistered from the Bluetooth
   // daemon, generally at the end of a pairing request.
@@ skipping 383 matching lines @@
 
   // D-Bus bus object is exported on, not owned by this object and must
   // outlive it.
   dbus::Bus* bus_;
 
   // All incoming method calls are passed on to the Delegate and a callback
   // passed to generate the reply. |delegate_| is generally the object that
   // owns this one, and must outlive it.
   Delegate* delegate_;
 
+  // D-Bus object path of object we are exporting, kept so we can unregister
+  // again in our destructor.
+  dbus::ObjectPath object_path_;
+
   // D-Bus object we are exporting, owned by this object.
   scoped_refptr<dbus::ExportedObject> exported_object_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothAgentServiceProviderImpl);
 };
 
 // The BluetoothAgentServiceProvider implementation used on Linux desktop,
 // which does nothing.
 class BluetoothAgentServiceProviderStubImpl
     : public BluetoothAgentServiceProvider {
@@ skipping 17 matching lines @@
     const dbus::ObjectPath& object_path,
     Delegate* delegate) {
   if (system::runtime_environment::IsRunningOnChromeOS()) {
     return new BluetoothAgentServiceProviderImpl(bus, object_path, delegate);
   } else {
     return new BluetoothAgentServiceProviderStubImpl(delegate);
   }
 }
 
 }  // namespace chromeos