commit 27c4aa55b33d3a3836cf70c8f7094bce1c5ead8c
author Chris Masone <cmasone@chromium.org> Sat Jul 02 13:10:14 2011 -0700
committer Chris Masone <cmasone@chromium.org> Sun Jul 03 10:58:05 2011 -0700
tree 2df1c92826d2608bf8dd5b5f8cdb99c6ab443035
parent 43b48a1c94665d9f3c14694cf6a4429e5ab3fa30

[shill] Use composition instead of inheritance with PropertyStore

Instead of having Device, Manager, etc all inherit from PropertyStore
and have it be difficult to follow the getting/setting property code,
have each include a PropertyStore as a data member.  Provide an
accessor so that RPC adaptor classes can get and set properties
directly and continue to handle any necessary type conversion
themselves.

BUG=None
TEST=unit tests

Change-Id: I34781bde4de0e152550ca636e28d472abde756af
Reviewed-on: http://gerrit.chromium.org/gerrit/3616
Tested-by: Chris Masone <cmasone@chromium.org>
Reviewed-by: Darin Petkov <petkov@chromium.org>

dhcp_config_unittest.cc

diff --git a/dhcp_config_unittest.cc b/dhcp_config_unittest.cc
index 4d736f6..24b1cee 100644
--- a/dhcp_config_unittest.cc
+++ b/dhcp_config_unittest.cc
@@ -286,13 +286,13 @@
 }
 
 TEST_F(DHCPConfigTest, Dispatch) {
-  EXPECT_TRUE(DBusAdaptor::DispatchOnType(config_.get(),
+  EXPECT_TRUE(DBusAdaptor::DispatchOnType(config_->store(),
                                           flimflam::kMtuProperty,
                                           PropertyStoreTest::kInt32V,
                                           NULL));
   ::DBus::Error error;
   // Ensure that an attempt to write a R/O property returns InvalidArgs error.
-  EXPECT_FALSE(DBusAdaptor::DispatchOnType(config_.get(),
+  EXPECT_FALSE(DBusAdaptor::DispatchOnType(config_->store(),
                                            flimflam::kAddressProperty,
                                            PropertyStoreTest::kStringV,
                                            &error));