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

src/service.h

 // 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.
 
 // TODO(vlaviano): update accessor style (GetFoo/SetFoo -> foo)
 
 #ifndef SRC_SERVICE_H_
 #define SRC_SERVICE_H_
 
 #include <glib.h>
 
 #include <map>
 #include <string>
-#include <vector>
 
 #include <base/basictypes.h>  // NOLINT
 #include <dbus-c++/dbus.h>    // NOLINT
 
 #include "src/data_plan.h"
 #include "src/data_plan_provider.h"
 #include "src/flimflam_service_client_glue.h"
 
 namespace cashew {
 
 class Device;
 class Policy;
 class ServiceManager;
 
 // map of key, value pairs representing service properties received via D-Bus
 typedef std::map<std::string, DBus::Variant> PropertyMap;
 
-// vector of Device objects
-typedef std::vector<Device*> DeviceList;
-
 // represents a cellular service and monitors Flimflam state for that service
 class Service : public org::chromium::flimflam::Service_proxy,
                 public DBus::IntrospectableProxy,
                 public DBus::ObjectProxy,
                 public DataPlanProviderDelegate {
   public:
     Service(ServiceManager * const parent,
             DBus::Connection& connection,  // NOLINT
             const DBus::Path& path);
     virtual ~Service();
@@ skipping 95 matching lines @@
 
     // set idle/timer source id
     virtual void SetGetPropertiesSourceId(guint source_id);
 
     // are we in the process of retrying our GetProperties call?
     virtual bool RetryingGetProperties() const;
 
     // set the retrying flag
     virtual void OnRetryingGetProperties(bool retrying);
 
-    // get deferred device deletion source id
-    virtual guint GetDeferredDeviceDeletionSourceId() const;
-
-    // set deferred device deletion source id
-    virtual void SetDeferredDeviceDeletionSourceId(guint source_id);
-
   private:
     // back pointer to our parent ServiceManager
     ServiceManager * const parent_;
 
     // D-Bus connection, owned by our creator
     // shared with Device obj that we create
     DBus::Connection& connection_;
 
     // D-Bus path for Flimflam service that we represent
     // this is our unique identifier
@@ skipping 36 matching lines @@
 
     // are we in the process of retrying our GetProperties call?
     // this flag exists to distinguish between our initial g_idle_add call
     // and our subsequent timer calls
     bool retrying_get_properties_;
 
     // Service connectivity state
     // finer-grained connectivity info applicable when |state_| == kStateReady
     ConnectivityState connectivity_state_;
 
-    // Device objects pending deletion from the main loop
-    // We need to do this to work around a dbus-c++ deadlock issue that arises
-    // when we send a D-Bus message from a D-Bus callback
-    DeviceList devices_pending_deletion_;
-
-    // glib source id for deferred device deletion
-    guint deferred_device_deletion_source_id_;
-
-    // deletes members of |devices_pending_deletion_| immediately
-    void DeletePendingDevices();
-
-    // schedule a device for later deletion from the main loop
-    void ScheduleDeviceForLaterDeletion(Device *device);
-
-    // glib integration: static wrapper for DeletePendingDevices
-    // takes object ptr as data and invokes object->DeletePendingDevices()
-    static gboolean StaticDeletePendingDevicesCallback(gpointer data);
-
     // convert connectivity state string to ConnectivityState enum value
     static ConnectivityState ConnectivityStateFromString(
         const std::string& connectivity_state);
 
     // convert state string to State enum value
     static State StateFromString(const std::string& state);
 
     // we've received updated Device info from Flimflam
     void OnDeviceUpdate(const DBus::Path& device_path);
 
@@ skipping 87 matching lines @@
 
     // consult policy to determine if we should send an unsolicited update
     void MaybeEmitDataPlansUpdate();
 
     DISALLOW_COPY_AND_ASSIGN(Service);
 };
 
 }  // namespace cashew
 
 #endif  // SRC_SERVICE_H_