Make ExportedObject and ObjectProxy own Bus as scoped_refptr.

dbus/bus.cc

 // Copyright (c) 2011 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 275 matching lines @@
     LOG(ERROR) << "Failed to release all service names. # of services left: "
                << owned_service_names_.size();
   }
 
   // Detach from the remote objects.
   for (ObjectProxyTable::iterator iter = object_proxy_table_.begin();
        iter != object_proxy_table_.end(); ++iter) {
     iter->second->Detach();
   }
 
+  // Release object proxies and exported objects here. We should do this
+  // here rather than in the destructor to avoid memory leaks due to
+  // cyclic references.
+  object_proxy_table_.clear();
+  exported_object_table_.clear();
+
   // Private connection should be closed.
   if (connection_) {
     if (connection_type_ == PRIVATE)
       dbus_connection_close(connection_);
     // dbus_connection_close() won't unref.
     dbus_connection_unref(connection_);
   }
 
   connection_ = NULL;
   shutdown_completed_ = true;
@@ skipping 433 matching lines @@
 }
 
 void Bus::OnDispatchStatusChangedThunk(DBusConnection* connection,
                                        DBusDispatchStatus status,
                                        void* data) {
   Bus* self = static_cast<Bus*>(data);
   return self->OnDispatchStatusChanged(connection, status);
 }
 
 }  // namespace dbus