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>
diff --git a/wifi_service.cc b/wifi_service.cc
index 14105ac..bdfa6e7 100644
--- a/wifi_service.cc
+++ b/wifi_service.cc
@@ -37,20 +37,21 @@
task_factory_(this),
wifi_(device),
ssid_(ssid) {
- eap_.key_management = key_management;
+ SetEAPKeyManagement(key_management);
- store_.RegisterConstString(flimflam::kModeProperty, &mode_);
- store_.RegisterString(flimflam::kPassphraseProperty, &passphrase_);
- store_.RegisterBool(flimflam::kPassphraseRequiredProperty, &need_passphrase_);
- store_.RegisterConstString(flimflam::kSecurityProperty, &security_);
- store_.RegisterConstUint8(flimflam::kSignalStrengthProperty, &strength_);
- store_.RegisterConstString(flimflam::kTypeProperty, &type_);
+ PropertyStore *store = this->store();
+ store->RegisterConstString(flimflam::kModeProperty, &mode_);
+ store->RegisterString(flimflam::kPassphraseProperty, &passphrase_);
+ store->RegisterBool(flimflam::kPassphraseRequiredProperty, &need_passphrase_);
+ store->RegisterConstString(flimflam::kSecurityProperty, &security_);
+ store->RegisterConstUint8(flimflam::kSignalStrengthProperty, &strength_);
+ store->RegisterConstString(flimflam::kTypeProperty, &type_);
- 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_);
+ 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_);
}
WiFiService::~WiFiService() {
@@ -62,7 +63,7 @@
// NB(quiche) defer handling, since dbus-c++ does not permit us to
// send an outbound request while processing an inbound one.
- dispatcher_->PostTask(
+ dispatcher()->PostTask(
task_factory_.NewRunnableMethod(&WiFiService::ConnectTask));
}
@@ -86,7 +87,7 @@
}
const string &WiFiService::key_management() const {
- return eap_.key_management;
+ return GetEAPKeyManagement();
}
const std::vector<uint8_t> &WiFiService::ssid() const {