Shill: ShillServiceClient destroys ShillClientHelpers when they are not need.

chromeos/dbus/shill_client_helper.h

 // 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.
 
 #ifndef CHROMEOS_DBUS_SHILL_CLIENT_HELPER_H_
 #define CHROMEOS_DBUS_SHILL_CLIENT_HELPER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 48 matching lines @@
   typedef base::Callback<void(const base::ListValue& result)> ListValueCallback;
 
   // A callback to handle errors for method call.
   typedef base::Callback<void(const std::string& error_name,
                               const std::string& error_message)> ErrorCallback;
 
   ShillClientHelper(dbus::Bus* bus, dbus::ObjectProxy* proxy);
 
   virtual ~ShillClientHelper();
 
+  // Returns true if there is a PropertyChangedObserver registered.
+  bool IsObserved() const;
+
+  // Returns true if the are method calls waiting for a response. If this
+  // function is called from within the return callback return true only if
+  // there are *other* calls waiting for a response.
+  bool IsWaitingResponse() const;
+
   // Adds an |observer| of the PropertyChanged signal.
   void AddPropertyChangedObserver(ShillPropertyChangedObserver* observer);
 
   // Removes an |observer| of the PropertyChanged signal.
   void RemovePropertyChangedObserver(ShillPropertyChangedObserver* observer);
 
-  // Starts monitoring PropertyChanged signal.
+  // Starts monitoring PropertyChanged signal. If there aren't observers for the
+  // PropertyChanged signal, the actual monitoring will be delayed until the
+  // first observer is added.
   void MonitorPropertyChanged(const std::string& interface_name);
 
   // Calls a method without results.
   void CallVoidMethod(dbus::MethodCall* method_call,
                       const VoidDBusMethodCallback& callback);
 
   // Calls a method with an object path result.
   void CallObjectPathMethod(dbus::MethodCall* method_call,
                             const ObjectPathDBusMethodCallback& callback);
 
@@ skipping 32 matching lines @@
   // This method returns NULL when method call fails.
   base::DictionaryValue* CallDictionaryValueMethodAndBlock(
       dbus::MethodCall* method_call);
 
   // Appends the value (basic types and string-to-string dictionary) to the
   // writer as a variant.
   static void AppendValueDataAsVariant(dbus::MessageWriter* writer,
                                        const base::Value& value);
 
  private:
+  // Starts monitoring PropertyChanged signal.
+  void MonitorPropertyChangedInternal(const std::string& interface_name);
+
   // Handles the result of signal connection setup.
   void OnSignalConnected(const std::string& interface,
                          const std::string& signal,
                          bool success);
 
   // Handles PropertyChanged signal.
   void OnPropertyChanged(dbus::Signal* signal);
 
   // Handles responses for methods without results.
   void OnVoidMethod(const VoidDBusMethodCallback& callback,
@@ skipping 35 matching lines @@
   // Handles errors for method calls.
   void OnError(const ErrorCallback& error_callback,
                dbus::ErrorResponse* response);
 
   // TODO(hashimoto): Remove this when we no longer need to make blocking calls.
   BlockingMethodCaller blocking_method_caller_;
   dbus::ObjectProxy* proxy_;
   PropertyChangedHandler property_changed_handler_;
   ObserverList<ShillPropertyChangedObserver, true /* check_empty */>
       observer_list_;
+  int in_progress_calls_;
+  std::vector<std::string> monitored_interfaces_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<ShillClientHelper> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ShillClientHelper);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_SHILL_CLIENT_HELPER_H_