commit ac4ac00189acd22ce95098712c74e1c2c23ede53
author Paul Stewart <pstew@chromium.org> Fri Aug 26 12:04:26 2011 -0700
committer Paul Stewart <pstew@chromium.org> Fri Aug 26 15:05:52 2011 -0700
tree 5147d656468d9f63342e774c7a6c457139fd0b6a
parent 1bdedf1296df51b2566c8d73299d52546167b971

shill: Clean up protected fields

...as per style.  I did omit property_store_unittest.h, which I'll
assign to cmasone instead of closing the issue.

BUG=chromium-os:19573
TEST=Rerun unit tests

Change-Id: I37874b6e71f50e91ca753d1ef4f1e25abf77032d
Reviewed-on: http://gerrit.chromium.org/gerrit/6764
Reviewed-by: Paul Stewart <pstew@chromium.org>
Tested-by: Paul Stewart <pstew@chromium.org>
Reviewed-by: Darin Petkov <petkov@chromium.org>

cellular_service.cc

diff --git a/cellular_service.cc b/cellular_service.cc
index a6c1140..bc27c5b 100644
--- a/cellular_service.cc
+++ b/cellular_service.cc
@@ -27,20 +27,21 @@
       strength_(0),
       cellular_(device),
       type_(flimflam::kTypeCellular) {
-  store_.RegisterConstString(flimflam::kActivationStateProperty,
+  PropertyStore *store = this->store();
+  store->RegisterConstString(flimflam::kActivationStateProperty,
                              &activation_state_);
-  store_.RegisterStringmap(flimflam::kCellularApnProperty, &apn_info_);
-  store_.RegisterConstStringmap(flimflam::kCellularLastGoodApnProperty,
+  store->RegisterStringmap(flimflam::kCellularApnProperty, &apn_info_);
+  store->RegisterConstStringmap(flimflam::kCellularLastGoodApnProperty,
                                 &last_good_apn_info_);
-  store_.RegisterConstString(flimflam::kNetworkTechnologyProperty,
+  store->RegisterConstString(flimflam::kNetworkTechnologyProperty,
                              &network_tech_);
-  store_.RegisterConstString(flimflam::kPaymentURLProperty, &payment_url_);
-  store_.RegisterConstString(flimflam::kRoamingStateProperty, &roaming_state_);
-  store_.RegisterConstStringmap(flimflam::kServingOperatorProperty,
+  store->RegisterConstString(flimflam::kPaymentURLProperty, &payment_url_);
+  store->RegisterConstString(flimflam::kRoamingStateProperty, &roaming_state_);
+  store->RegisterConstStringmap(flimflam::kServingOperatorProperty,
                                 &serving_operator_.ToDict());
-  store_.RegisterConstUint8(flimflam::kSignalStrengthProperty, &strength_);
-  store_.RegisterConstString(flimflam::kTypeProperty, &type_);
-  store_.RegisterConstString(flimflam::kUsageURLProperty, &usage_url_);
+  store->RegisterConstUint8(flimflam::kSignalStrengthProperty, &strength_);
+  store->RegisterConstString(flimflam::kTypeProperty, &type_);
+  store->RegisterConstString(flimflam::kUsageURLProperty, &usage_url_);
 }
 
 CellularService::~CellularService() { }