This converts the Shill clients to allow propagation of shill errors

chromeos/dbus/shill_ipconfig_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_ipconfig_client.h"
 #include "dbus/message.h"
 #include "dbus/values_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
+using testing::_;
+using testing::ByRef;
+
 namespace chromeos {
 
 namespace {
 
 const char kExampleIPConfigPath[] = "/foo/bar";
 
 }  // namespace
 
 class ShillIPConfigClientTest : public ShillClientUnittestBase {
  public:
@@ skipping 23 matching lines @@
 TEST_F(ShillIPConfigClientTest, PropertyChanged) {
   // Create a signal.
   const base::FundamentalValue kConnected(true);
   dbus::Signal signal(flimflam::kFlimflamIPConfigInterface,
                       flimflam::kMonitorPropertyChanged);
   dbus::MessageWriter writer(&signal);
   writer.AppendString(flimflam::kConnectedProperty);
   dbus::AppendBasicTypeValueDataAsVariant(&writer, kConnected);
 
   // Set expectations.
-  client_->SetPropertyChangedHandler(dbus::ObjectPath(kExampleIPConfigPath),
-                                     base::Bind(&ExpectPropertyChanged,
-                                                flimflam::kConnectedProperty,
-                                                &kConnected));
+  MockPropertyChangeObserver observer;
+  EXPECT_CALL(observer, OnPropertyChanged(flimflam::kConnectedProperty,
+                                          ValueEq(ByRef(kConnected)))).Times(1);
+
+  // Add the observer
+  client_->AddPropertyChangedObserver(
+      dbus::ObjectPath(kExampleIPConfigPath),
+      &observer);
+
   // Run the signal callback.
   SendPropertyChangedSignal(&signal);
 
-  // Reset the handler.
-  client_->ResetPropertyChangedHandler(dbus::ObjectPath(kExampleIPConfigPath));
+  // Remove the observer.
+  client_->RemovePropertyChangedObserver(
+      dbus::ObjectPath(kExampleIPConfigPath),
+      &observer);
+
+  EXPECT_CALL(observer, OnPropertyChanged(_, _)).Times(0);
+
+  // Run the signal callback again and make sure the observer isn't called.
+  SendPropertyChangedSignal(&signal);
 }
 
 TEST_F(ShillIPConfigClientTest, GetProperties) {
   const char kAddress[] = "address";
   const int32 kMtu = 68;
 
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   dbus::MessageWriter writer(response.get());
   dbus::MessageWriter array_writer(NULL);
@@ skipping 132 matching lines @@
   // Set expectations.
   PrepareForMethodCall(flimflam::kRemoveConfigFunction,
                        base::Bind(&ExpectNoArgument),
                        response.get());
   // Call method.
   EXPECT_TRUE(client_->CallRemoveAndBlock(
       dbus::ObjectPath(kExampleIPConfigPath)));
 }
 
 }  // namespace chromeos