commit 5f316f65dd63b21c050f48410170482bfe92e286
author Darin Petkov <petkov@chromium.org> Fri Nov 18 12:10:26 2011 +0100
committer Gerrit <chrome-bot@google.com> Fri Nov 18 07:55:02 2011 -0800
tree 52e8d6368a05071b9d45352c612f9778d34f8a6d
parent 721ac93ab19a9169872a296626adb49279031af5

shill: Remove Cellular's obsolete |type_| data member.

Also, some cleanup and renaming.

BUG=chromium-os:18735
TEST=unit tests

Change-Id: Ia201113a9514c884a69209a2fd06a01068e8bd14
Reviewed-on: https://gerrit.chromium.org/gerrit/11901
Commit-Ready: Darin Petkov <petkov@chromium.org>
Reviewed-by: Darin Petkov <petkov@chromium.org>
Tested-by: Darin Petkov <petkov@chromium.org>

cellular_capability_gsm.cc

diff --git a/cellular_capability_gsm.cc b/cellular_capability_gsm.cc
index 7296bf9..7e5b9ef 100644
--- a/cellular_capability_gsm.cc
+++ b/cellular_capability_gsm.cc
@@ -41,6 +41,7 @@
       access_technology_(MM_MODEM_GSM_ACCESS_TECH_UNKNOWN),
       scanning_(false),
       scan_interval_(0) {
+  VLOG(2) << "Cellular capability constructed: GSM";
   PropertyStore *store = cellular->mutable_store();
   store->RegisterConstString(flimflam::kSelectedNetworkProperty,
                              &selected_network_);
@@ -71,7 +72,7 @@
               this, get, set)));
 }
 
-void CellularCapabilityGSM::OnStart() {
+void CellularCapabilityGSM::OnDeviceStarted() {
   VLOG(2) << __func__;
   card_proxy_.reset(
       proxy_factory()->CreateModemGSMCardProxy(this,
@@ -83,12 +84,18 @@
                                                   cellular()->dbus_owner()));
 }
 
-void CellularCapabilityGSM::OnStop() {
+void CellularCapabilityGSM::OnDeviceStopped() {
   VLOG(2) << __func__;
   card_proxy_.reset();
   network_proxy_.reset();
 }
 
+void CellularCapabilityGSM::OnServiceCreated() {
+  cellular()->service()->set_activation_state(
+      flimflam::kActivationStateActivated);
+  UpdateServingOperator();
+}
+
 void CellularCapabilityGSM::UpdateStatus(const DBusPropertiesMap &properties) {
   string imsi;
   if (DBusProperties::GetString(properties, "imsi", &imsi)) {
@@ -432,12 +439,6 @@
       properties, kPropertyUnlockRetries, &sim_lock_status_.retries_left);
 }
 
-void CellularCapabilityGSM::OnServiceCreated() {
-  cellular()->service()->set_activation_state(
-      flimflam::kActivationStateActivated);
-  UpdateServingOperator();
-}
-
 void CellularCapabilityGSM::OnGSMNetworkModeChanged(uint32 /*mode*/) {
   // TODO(petkov): Implement this.
   NOTIMPLEMENTED();