Shill: ShillServiceClient destroys ShillClientHelpers when they are not need.

chromeos/dbus/shill_service_client_unittest.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 "base/bind.h"
 #include "base/values.h"
 #include "chromeos/dbus/shill_client_unittest_base.h"
 #include "chromeos/dbus/shill_service_client.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
@@ skipping 46 matching lines @@
   writer.AppendVariantOfByte(kValue);
 
   // Set expectations.
   const base::FundamentalValue value(kValue);
   MockPropertyChangeObserver observer;
   EXPECT_CALL(observer,
               OnPropertyChanged(
                   flimflam::kSignalStrengthProperty,
                   ValueEq(ByRef(value)))).Times(1);
 
+  // The ShillClientHelper should be created here because of this call.
+  EXPECT_CALL(*mock_bus_, RemoveObjectProxy(_,
+      dbus::ObjectPath(kExampleServicePath), _)).Times(0);
+
   // Add the observer
   client_->AddPropertyChangedObserver(
       dbus::ObjectPath(kExampleServicePath),
       &observer);
 
   // Run the signal callback.
   SendPropertyChangedSignal(&signal);
 
+  EXPECT_CALL(*mock_bus_, RemoveObjectProxy(_,
+      dbus::ObjectPath(kExampleServicePath), _)).Times(1);
+
   // Remove the observer.
   client_->RemovePropertyChangedObserver(
       dbus::ObjectPath(kExampleServicePath),
       &observer);
 
   EXPECT_CALL(observer, OnPropertyChanged(_, _)).Times(0);
 
   // Run the signal callback again and make sure the observer isn't called.
   SendPropertyChangedSignal(&signal);
 }
@@ skipping 201 matching lines @@
   PrepareForMethodCall(flimflam::kActivateCellularModemFunction,
                        base::Bind(&ExpectStringArgument, kCarrier),
                        response.get());
   // Call method.
   const bool result = client_->CallActivateCellularModemAndBlock(
       dbus::ObjectPath(kExampleServicePath), kCarrier);
   EXPECT_TRUE(result);
 }
 
 }  // namespace chromeos