commit 3e509242f1a0e2e018a5c18a8d7b9224c6044d9a
author Darin Petkov <petkov@chromium.org> Thu Nov 10 14:46:44 2011 +0100
committer Gerrit <chrome-bot@google.com> Fri Nov 11 06:45:30 2011 -0800
tree 34304a5c9100a99bc3638d9bf4ca8eb646dd418b
parent 6ab23a9d4526686406d50081853639540b22213a

shill: Retrieve cellular signal strength in capability delegates.

Refactor only, no functional changes.

BUG=chromium-os:18735
TEST=unit tests

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

cellular.cc

diff --git a/cellular.cc b/cellular.cc
index a5b7127..e2426b9 100644
--- a/cellular.cc
+++ b/cellular.cc
@@ -452,7 +452,7 @@
     // For now, no endpoint is created. Revisit if necessary.
     CreateService();
   }
-  GetModemSignalQuality();
+  capability_->GetSignalQuality();
   if (state_ == kStateRegistered && modem_state_ == kModemStateConnected) {
     SetState(kStateConnected);
     EstablishLink();
@@ -461,35 +461,6 @@
   service_->set_roaming_state(capability_->GetRoamingStateString());
 }
 
-void Cellular::GetModemSignalQuality() {
-  VLOG(2) << __func__;
-  uint32 strength = 0;
-  switch (type_) {
-    case kTypeGSM:
-      strength = GetGSMSignalQuality();
-      break;
-    case kTypeCDMA:
-      strength = GetCDMASignalQuality();
-      break;
-    default: NOTREACHED();
-  }
-  HandleNewSignalQuality(strength);
-}
-
-uint32 Cellular::GetCDMASignalQuality() {
-  VLOG(2) << __func__;
-  CHECK_EQ(kTypeCDMA, type_);
-  // TODO(petkov): Switch to asynchronous calls (crosbug.com/17583).
-  return cdma_proxy_->GetSignalQuality();
-}
-
-uint32 Cellular::GetGSMSignalQuality() {
-  VLOG(2) << __func__;
-  CHECK_EQ(kTypeGSM, type_);
-  // TODO(petkov): Switch to asynchronous calls (crosbug.com/17583).
-  return gsm_network_proxy_->GetSignalQuality();
-}
-
 void Cellular::HandleNewSignalQuality(uint32 strength) {
   VLOG(2) << "Signal strength: " << strength;
   if (service_.get()) {