commit daf4386a4775be7c965493749ccfe2fecc2e4167
author Darin Petkov <petkov@chromium.org> Thu Oct 27 11:37:28 2011 +0200
committer Gerrit <chrome-bot@google.com> Fri Nov 04 02:59:56 2011 -0700
tree 604c51f0fd94515dd71419e4d53f5c17a70a26b2
parent be005174bce39ddad185c2eb6808117484d522ad

shill: Start moving tehnology-specific functionality to capability delegates.

This basic patch demonstrates the intent to move CDMA/GSM-specific functionality
into capability delegates. This should reduce the conditional code in the
Cellular class and make it more readable and easier to maintain.

BUG=chromium-os:18735
TEST=unit tests

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

cellular.cc

diff --git a/cellular.cc b/cellular.cc
index 666a8ce..495b479 100644
--- a/cellular.cc
+++ b/cellular.cc
@@ -17,6 +17,8 @@
 #include <chromeos/dbus/service_constants.h>
 #include <mm/mm-modem.h>
 
+#include "shill/cellular_capability_cdma.h"
+#include "shill/cellular_capability_gsm.h"
 #include "shill/cellular_service.h"
 #include "shill/control_interface.h"
 #include "shill/device.h"
@@ -302,6 +304,7 @@
 void Cellular::Start() {
   LOG(INFO) << __func__ << ": " << GetStateString(state_);
   Device::Start();
+  InitCapability();  // For now, only a single capability is supported.
   InitProxies();
   EnableModem();
   if (type_ == kTypeGSM) {
@@ -317,6 +320,7 @@
 }
 
 void Cellular::Stop() {
+  capability_.reset();
   proxy_.reset();
   simple_proxy_.reset();
   cdma_proxy_.reset();
@@ -328,26 +332,25 @@
   Device::Stop();
 }
 
+void Cellular::InitCapability() {
+  VLOG(2) << __func__;
+  switch (type_) {
+    case kTypeGSM:
+      capability_.reset(new CellularCapabilityGSM(this));
+      break;
+    case kTypeCDMA:
+      capability_.reset(new CellularCapabilityCDMA(this));
+      break;
+    default: NOTREACHED();
+  }
+}
+
 void Cellular::InitProxies() {
   VLOG(2) << __func__;
   proxy_.reset(proxy_factory_->CreateModemProxy(this, dbus_path_, dbus_owner_));
   simple_proxy_.reset(
       proxy_factory_->CreateModemSimpleProxy(dbus_path_, dbus_owner_));
-  switch (type_) {
-    case kTypeGSM:
-      gsm_card_proxy_.reset(
-          proxy_factory_->CreateModemGSMCardProxy(
-              this, dbus_path_, dbus_owner_));
-      gsm_network_proxy_.reset(
-          proxy_factory_->CreateModemGSMNetworkProxy(
-              this, dbus_path_, dbus_owner_));
-      break;
-    case kTypeCDMA:
-      cdma_proxy_.reset(
-          proxy_factory_->CreateModemCDMAProxy(this, dbus_path_, dbus_owner_));
-      break;
-    default: NOTREACHED();
-  }
+  capability_->InitProxies();
 }
 
 void Cellular::EnableModem() {