This converts the Shill clients to allow propagation of shill errors

chromeos/dbus/shill_network_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_network_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 kExampleNetworkPath[] = "/foo/bar";
 
 }  // namespace
 
 class ShillNetworkClientTest : public ShillClientUnittestBase {
  public:
@@ skipping 23 matching lines @@
 TEST_F(ShillNetworkClientTest, PropertyChanged) {
   // Create a signal.
   const base::FundamentalValue kConnected(true);
   dbus::Signal signal(flimflam::kFlimflamNetworkInterface,
                       flimflam::kMonitorPropertyChanged);
   dbus::MessageWriter writer(&signal);
   writer.AppendString(flimflam::kConnectedProperty);
   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) {
   const char kAddress[] = "address";
   const char kName[] = "name";
   const uint8 kSignalStrength = 1;
   const uint32 kWifiChannel = 1;
   const bool kConnected = true;
 
   // Create response.
@@ skipping 82 matching lines @@
   // Call method.
   scoped_ptr<base::DictionaryValue> result(
       client_->CallGetPropertiesAndBlock(
           dbus::ObjectPath(kExampleNetworkPath)));
 
   ASSERT_TRUE(result.get());
   EXPECT_TRUE(result->Equals(&value));
 }
 
 }  // namespace chromeos