Clean up potentially leaky use of base::DeletePointer.

dbus/object_manager.cc

 // Copyright (c) 2013 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 "dbus/object_manager.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
@@ skipping 271 matching lines @@
     LOG(ERROR) << "Rejecting a message from a wrong sender.";
     UMA_HISTOGRAM_COUNTS("DBus.RejectedSignalCount", 1);
     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
   }
 
   const ObjectPath path = signal->GetPath();
 
   if (bus_->HasDBusThread()) {
     // Post a task to run the method in the origin thread. Transfer ownership of
     // |signal| to NotifyPropertiesChanged, which will handle the clean up.
-    Signal* released_signal = signal.release();
     bus_->GetOriginTaskRunner()->PostTask(
         FROM_HERE,
         base::Bind(&ObjectManager::NotifyPropertiesChanged,
                    this, path,
-                   released_signal));
+                   base::Passed(&signal)));
   } else {
     // If the D-Bus thread is not used, just call the callback on the
     // current thread. Transfer the ownership of |signal| to
     // NotifyPropertiesChanged.
-    NotifyPropertiesChanged(path, signal.release());
+    NotifyPropertiesChanged(path, signal.Pass());
   }
 
   // We don't return DBUS_HANDLER_RESULT_HANDLED for signals because other
   // objects may be interested in them. (e.g. Signals from org.freedesktop.DBus)
   return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
 
 void ObjectManager::NotifyPropertiesChanged(
     const dbus::ObjectPath object_path,
-    Signal* signal) {
+    scoped_ptr<Signal> signal) {
   DCHECK(bus_);
   bus_->AssertOnOriginThread();
 
-  NotifyPropertiesChangedHelper(object_path, signal);
+  NotifyPropertiesChangedHelper(object_path, signal.get());
 
   // Delete the message on the D-Bus thread. See comments in HandleMessage.
   bus_->GetDBusTaskRunner()->PostTask(
       FROM_HERE,
-      base::Bind(&base::DeletePointer<Signal>, signal));
+      base::Bind(&base::DeletePointer<Signal>, base::Passed(&signal)));
 }
 
 void ObjectManager::NotifyPropertiesChangedHelper(
     const dbus::ObjectPath object_path,
     Signal* signal) {
   DCHECK(bus_);
   bus_->AssertOnOriginThread();
 
   MessageReader reader(signal);
   std::string interface;
@@ skipping 186 matching lines @@
         RemoveInterface(object_path, *iiter);
     }
 
   }
 
   if (!new_owner.empty())
     GetManagedObjects();
 }
 
 }  // namespace dbus