commit 9f06c870229b00cdd19224cb12c4202de65772ae
author Prathmesh Prabhu <pprabhu@chromium.org> Thu Nov 21 14:08:23 2013 -0800
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Thu Dec 05 07:46:51 2013 +0000
tree 840c0431e552916635ade61cda1203c6778d8c32
parent eadf89f62c747f0b4caff74df37e821e419f68e9

shill: Consolidate Cellular DBus properties in the Cellular class.

BUG=chromium:321854
TEST=(1) Run platform2 unittests.
     (2) Run network_3g, network_ui, network3g_pseudomodem suite on 3G, LTE, and
         CDMA modems.

Change-Id: I5717c5de8597f8bfac15b3947f455c6e44344929
Reviewed-on: https://chromium-review.googlesource.com/177700
Reviewed-by: Ben Chan <benchan@chromium.org>
Tested-by: Prathmesh Prabhu <pprabhu@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>

cellular_capability_cdma.cc

diff --git a/cellular_capability_cdma.cc b/cellular_capability_cdma.cc
index 7f4adc5..113a4eb 100644
--- a/cellular_capability_cdma.cc
+++ b/cellular_capability_cdma.cc
@@ -232,10 +232,10 @@
 
 void CellularCapabilityCDMA::GetMEID(const ResultCallback &callback) {
   SLOG(Cellular, 2) << __func__;
-  if (meid_.empty()) {
+  if (cellular()->meid().empty()) {
     // TODO(petkov): Switch to asynchronous calls (crbug.com/200687).
-    meid_ = proxy_->MEID();
-    SLOG(Cellular, 2) << "MEID: " << meid_;
+    cellular()->set_meid(proxy_->MEID());
+    SLOG(Cellular, 2) << "MEID: " << cellular()->meid();
   }
   callback.Run(Error());
 }
@@ -308,8 +308,8 @@
 
 string CellularCapabilityCDMA::CreateFriendlyServiceName() {
   SLOG(Cellular, 2) << __func__;
-  if (!carrier_.empty()) {
-    return carrier_;
+  if (!cellular()->carrier().empty()) {
+    return cellular()->carrier();
   }
   return base::StringPrintf("CDMANetwork%u", friendly_service_name_id_++);
 }
@@ -356,8 +356,13 @@
     uint32 activation_error,
     const DBusPropertiesMap &status_changes) {
   SLOG(Cellular, 2) << __func__;
-  DBusProperties::GetString(status_changes, "mdn", &mdn_);
-  DBusProperties::GetString(status_changes, "min", &min_);
+  string prop_value;
+
+  if (DBusProperties::GetString(status_changes, "mdn", &prop_value))
+    cellular()->set_mdn(prop_value);
+  if (DBusProperties::GetString(status_changes, "min", &prop_value))
+    cellular()->set_min(prop_value);
+
   string payment;
   if (DBusProperties::GetString(status_changes, "payment_url", &payment)) {
     olp_.SetURL(payment);