commit 20c13ec645faacb9c517fd2c574aa7fa30d890d0
author Darin Petkov <petkov@chromium.org> Wed Nov 09 15:07:15 2011 +0100
committer Gerrit <chrome-bot@google.com> Thu Nov 10 08:50:47 2011 -0800
tree 68cb87ade303d1093b0daee991b7f88f517e35af
parent cb547737d288052935052eeb341b30922b4022a0

shill: Move Get{NetworkTechnology|RoamingState} to the capability delegates.

BUG=chromium-os:18735
TEST=unit tests

Change-Id: I29cd4054810d44718047717234f5ccfddf3a745c
Reviewed-on: https://gerrit.chromium.org/gerrit/11376
Tested-by: Darin Petkov <petkov@chromium.org>
Reviewed-by: Eric Shienbrood <ers@chromium.org>
Commit-Ready: Darin Petkov <petkov@chromium.org>

cellular.h

diff --git a/cellular.h b/cellular.h
index c70abef..051930c 100644
--- a/cellular.h
+++ b/cellular.h
@@ -138,6 +138,16 @@
   const std::string &dbus_owner() const { return dbus_owner_; }
   const std::string &dbus_path() const { return dbus_path_; }
 
+  uint32 gsm_registration_state() const { return gsm_.registration_state; }
+  uint32 gsm_access_technology() const { return gsm_.access_technology; }
+
+  uint32 cdma_registration_state_evdo() const {
+    return cdma_.registration_state_evdo;
+  }
+  uint32 cdma_registration_state_1x() const {
+    return cdma_.registration_state_1x;
+  }
+
   const std::string &meid() const { return meid_; }
   void set_meid(const std::string &meid) { meid_ = meid; }
 
@@ -188,18 +198,16 @@
 
  private:
   friend class CellularTest;
+  friend class CellularCapabilityCDMATest;
+  friend class CellularCapabilityGSMTest;
   FRIEND_TEST(CellularTest, Activate);
   FRIEND_TEST(CellularTest, ActivateError);
   FRIEND_TEST(CellularTest, CreateService);
   FRIEND_TEST(CellularTest, Connect);
   FRIEND_TEST(CellularTest, GetCDMAActivationStateString);
   FRIEND_TEST(CellularTest, GetCDMAActivationErrorString);
-  FRIEND_TEST(CellularTest, GetCDMANetworkTechnologyString);
   FRIEND_TEST(CellularTest, GetCDMARegistrationState);
-  FRIEND_TEST(CellularTest, GetCDMARoamingStateString);
   FRIEND_TEST(CellularTest, GetCDMASignalQuality);
-  FRIEND_TEST(CellularTest, GetGSMNetworkTechnologyString);
-  FRIEND_TEST(CellularTest, GetGSMRoamingStateString);
   FRIEND_TEST(CellularTest, GetGSMSignalQuality);
   FRIEND_TEST(CellularTest, GetModemInfo);
   FRIEND_TEST(CellularTest, GetModemStatus);
@@ -274,11 +282,6 @@
   std::string GetTypeString() const;
   static std::string GetStateString(State state);
 
-  // Returns an empty string if the network technology is unknown.
-  std::string GetNetworkTechnologyString() const;
-
-  std::string GetRoamingStateString() const;
-
   static std::string GetCDMAActivationStateString(uint32 state);
   static std::string GetCDMAActivationErrorString(uint32 error);