Shill: ShillServiceClient destroys ShillClientHelpers when they are not need.

dbus/mock_bus.h

Index: dbus/mock_bus.h
diff --git a/dbus/mock_bus.h b/dbus/mock_bus.h
index 33a62e0577d8dce187ff6502d8f1a13939733655..c47c90262e76544a037712aaf21414c6fa368854 100644
--- a/dbus/mock_bus.h
+++ b/dbus/mock_bus.h
@@ -24,6 +24,14 @@ class MockBus : public Bus {
                ObjectProxy*(const std::string& service_name,
                             const ObjectPath& object_path,
                             int options));
+  MOCK_METHOD3(RemoveObjectProxy, bool(const std::string& service_name,
+                                       const ObjectPath& object_path,
+                                       const base::Closure& callback));
+  MOCK_METHOD4(RemoveObjectProxyWithOptions,
+               bool(const std::string& service_name,
+                    const ObjectPath& object_path,
+                    int options,
+                    const base::Closure& callback));
   MOCK_METHOD1(GetExportedObject, ExportedObject*(
       const ObjectPath& object_path));
   MOCK_METHOD0(ShutdownAndBlock, void());