This converts the Shill clients to use an observer pattern

for property change notifications because in a future CL the
javascript private API will need to listen directly to shill
notifications as well, and the previous implementation was limited to
a single handler.

BUG=chromium:147620,chromium:146616
TEST=Ran unit tests, ran on device.


Review URL: https://chromiumcodereview.appspot.com/10965045

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158972 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 21 insertions, 6 deletions

diff --git a/chromeos/dbus/shill_ipconfig_client_unittest.cc b/chromeos/dbus/shill_ipconfig_client_unittest.cc
index 60bca25..a89a450 100644
--- a/chromeos/dbus/shill_ipconfig_client_unittest.cc
+++ b/chromeos/dbus/shill_ipconfig_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,27 @@ TEST_F(ShillIPConfigClientTest, PropertyChanged) {
   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) {