Stop deleting ObjectProxy::OnPendingCallIsCompleteData manually

dbus/object_proxy.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 "dbus/bus.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
@@ skipping 257 matching lines @@
   // The data will be deleted in OnPendingCallIsCompleteThunk().
   OnPendingCallIsCompleteData* data =
       new OnPendingCallIsCompleteData(this, response_callback, error_callback,
                                       start_time);
 
   // This returns false only when unable to allocate memory.
   const bool success = dbus_pending_call_set_notify(
       pending_call,
       &ObjectProxy::OnPendingCallIsCompleteThunk,
       data,
-      NULL);
+      &DeleteVoidPointer<OnPendingCallIsCompleteData>);
   CHECK(success) << "Unable to allocate memory";
   dbus_pending_call_unref(pending_call);
 
   // It's now safe to unref the request message.
   dbus_message_unref(request_message);
 }
 
 void ObjectProxy::OnPendingCallIsComplete(DBusPendingCall* pending_call,
                                           ResponseCallback response_callback,
                                           ErrorCallback error_callback,
@@ skipping 71 matching lines @@
 
 void ObjectProxy::OnPendingCallIsCompleteThunk(DBusPendingCall* pending_call,
                                                void* user_data) {
   OnPendingCallIsCompleteData* data =
       reinterpret_cast<OnPendingCallIsCompleteData*>(user_data);
   ObjectProxy* self = data->object_proxy;
   self->OnPendingCallIsComplete(pending_call,
                                 data->response_callback,
                                 data->error_callback,
                                 data->start_time);
-  delete data;
 }
 
 bool ObjectProxy::ConnectToNameOwnerChangedSignal() {
   bus_->AssertOnDBusThread();
 
   if (!bus_->Connect() || !bus_->SetUpAsyncOperations())
     return false;
 
   bus_->AddFilterFunction(&ObjectProxy::HandleMessageThunk, this);
 
@@ skipping 310 matching lines @@
     bool service_is_available) {
   bus_->AssertOnOriginThread();
 
   std::vector<WaitForServiceToBeAvailableCallback> callbacks;
   callbacks.swap(wait_for_service_to_be_available_callbacks_);
   for (size_t i = 0; i < callbacks.size(); ++i)
     callbacks[i].Run(service_is_available);
 }
 
 }  // namespace dbus