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>

wifi_service.cc

diff --git a/wifi_service.cc b/wifi_service.cc
index 6f4e959..59d7d36 100644
--- a/wifi_service.cc
+++ b/wifi_service.cc
@@ -33,19 +33,19 @@
   eap_.key_management = key_management;
 
   // TODO(cmasone): Figure out if mode_ should be a string or what
-  // RegisterString(flimflam::kModeProperty, &mode_);
-  RegisterString(flimflam::kPassphraseProperty, &passphrase_);
-  RegisterBool(flimflam::kPassphraseRequiredProperty, &need_passphrase_);
-  RegisterConstString(flimflam::kSecurityProperty, &security_);
+  // store_.RegisterString(flimflam::kModeProperty, &mode_);
+  store_.RegisterString(flimflam::kPassphraseProperty, &passphrase_);
+  store_.RegisterBool(flimflam::kPassphraseRequiredProperty, &need_passphrase_);
+  store_.RegisterConstString(flimflam::kSecurityProperty, &security_);
 
-  RegisterConstString(flimflam::kWifiAuthMode, &auth_mode_);
-  RegisterConstBool(flimflam::kWifiHiddenSsid, &hidden_ssid_);
-  RegisterConstUint16(flimflam::kWifiFrequency, &frequency_);
-  RegisterConstUint16(flimflam::kWifiPhyMode, &physical_mode_);
-  RegisterConstUint16(flimflam::kWifiHexSsid, &hex_ssid_);
+  store_.RegisterConstString(flimflam::kWifiAuthMode, &auth_mode_);
+  store_.RegisterConstBool(flimflam::kWifiHiddenSsid, &hidden_ssid_);
+  store_.RegisterConstUint16(flimflam::kWifiFrequency, &frequency_);
+  store_.RegisterConstUint16(flimflam::kWifiPhyMode, &physical_mode_);
+  store_.RegisterConstUint16(flimflam::kWifiHexSsid, &hex_ssid_);
 
-  RegisterConstUint8(flimflam::kSignalStrengthProperty, &strength_);
-  RegisterConstString(flimflam::kTypeProperty, &type_);
+  store_.RegisterConstUint8(flimflam::kSignalStrengthProperty, &strength_);
+  store_.RegisterConstString(flimflam::kTypeProperty, &type_);
 }
 
 WiFiService::~WiFiService() {