This converts the Shill clients to allow propagation of shill errors

chromeos/dbus/shill_network_client_unittest.cc

Index: chromeos/dbus/shill_network_client_unittest.cc
diff --git a/chromeos/dbus/shill_network_client_unittest.cc b/chromeos/dbus/shill_network_client_unittest.cc
index 417d2586e462df5e8363c6f7fb8073aeaa165f03..e300332d493ebd0f2f38f4213ca00ccbcfb17768 100644
--- a/chromeos/dbus/shill_network_client_unittest.cc
+++ b/chromeos/dbus/shill_network_client_unittest.cc
@@ -11,6 +11,9 @@
 #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 {
@@ -54,15 +57,29 @@ TEST_F(ShillNetworkClientTest, PropertyChanged) {
   dbus::AppendBasicTypeValueDataAsVariant(&writer, kConnected);
 
   // Set expectations.
-  client_->SetPropertyChangedHandler(dbus::ObjectPath(kExampleNetworkPath),
-                                     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(kExampleNetworkPath),
+      &observer);
+
   // Run the signal callback.
   SendPropertyChangedSignal(&signal);
 
-  // Reset the handler.
-  client_->ResetPropertyChangedHandler(dbus::ObjectPath(kExampleNetworkPath));
+  // Remove the observer.
+  client_->RemovePropertyChangedObserver(
+      dbus::ObjectPath(kExampleNetworkPath),
+      &observer);
+
+  EXPECT_CALL(observer, OnPropertyChanged(_, _)).Times(0);
+
+  // Run the signal callback again and make sure the observer isn't called.
+  SendPropertyChangedSignal(&signal);
 }
 
 TEST_F(ShillNetworkClientTest, GetProperties) {