Revert "cashew: do not delete DBus::ObjectProxy objects from D-Bus callbacks"

src/cashew_server.cc

 // Copyright (c) 2010 The Chromium OS 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 "src/cashew_server.h"
 
 #include <glog/logging.h>
 
 #include "src/service_manager.h"
 
 namespace cashew {
 
 const char* CashewServer::kServiceName = "org.chromium.Cashew";
 const char* CashewServer::kServicePath = "/org/chromium/Cashew";
 
 // Cashew D-Bus errors
 const char* kCashewErrorServiceUnknown =
     "org.chromium.Cashew.Error.ServiceUnknown";
 
 CashewServer::CashewServer(DBus::Connection& connection,  // NOLINT
-                           ServiceManager * const service_manager,
-                           GMainLoop * const main_loop)
+                           ServiceManager * const service_manager)
     : DBus::ObjectAdaptor(connection, kServicePath),
-      service_manager_(CHECK_NOTNULL(service_manager)),
-      main_loop_(CHECK_NOTNULL(main_loop)) {
+      service_manager_(CHECK_NOTNULL(service_manager)) {
   service_manager_->SetCashewServer(this);
 }
 
 CashewServer::~CashewServer() {
-  DCHECK(!g_main_loop_is_running(main_loop_));
   service_manager_->SetCashewServer(NULL);
 }
 
 // Cashew D-Bus API methods
 
 DBusDataPlanList CashewServer::GetDataPlans(const std::string& service_path,
                                             DBus::Error& error) {  // NOLINT
   DLOG(INFO) << "GetDataPlans: service = " << service_path;
   DBusDataPlanList dbus_data_plans;
   const Service *service = service_manager_->GetService(service_path);
@@ skipping 40 matching lines @@
 
 void CashewServer::EmitDataPlansUpdateSignal(const Service& service) {
   DLOG(INFO) << "EmitDataPlansUpdateSignal: service = " << service.GetPath();
   DBusDataPlanList dbus_data_plans = service.GetDBusDataPlans();
 
   // send out the signal
   DataPlansUpdate(service.GetPath(), dbus_data_plans);
 }
 
 }  // namespace cashew