commit ae0c64ea644748f28b7a320e9663f30cd69e344e
author Darin Petkov <petkov@chromium.org> Tue Nov 15 15:50:27 2011 +0100
committer Gerrit <chrome-bot@google.com> Thu Nov 17 09:25:43 2011 -0800
tree ffce3bee66b9fc7acfcdc59a56081629cbec5f09
parent f770945ec8c2cb606e922be4e91a1f6a4b454fc6

shill: Move GSM/CDMA structs to capability delegates.

BUG=chromium-os:18735
TEST=unit tests

Change-Id: I3b1e1935465ac728d204fbad411ef6abf85b02f6
Reviewed-on: https://gerrit.chromium.org/gerrit/11764
Tested-by: Darin Petkov <petkov@chromium.org>
Reviewed-by: Jason Glasgow <jglasgow@chromium.org>
Commit-Ready: Darin Petkov <petkov@chromium.org>

cellular.h

diff --git a/cellular.h b/cellular.h
index 8567d50..090c589 100644
--- a/cellular.h
+++ b/cellular.h
@@ -142,19 +142,8 @@
   const std::string &dbus_owner() const { return dbus_owner_; }
   const std::string &dbus_path() const { return dbus_path_; }
 
-  void set_gsm_network_id(const std::string &id) { gsm_.network_id = id; }
-  void set_gsm_operator_name(const std::string &name) {
-    gsm_.operator_name = name;
-  }
-
-  uint32 gsm_access_technology() const { return gsm_.access_technology; }
-
-  uint32 cdma_activation_state() const { return cdma_.activation_state; }
-  void set_cdma_activation_state(uint32 state) {
-    cdma_.activation_state = state;
-  }
-
-  void set_cdma_payment_url(const std::string &url) { cdma_.payment_url = url; }
+  const Operator &home_provider() const { return home_provider_; }
+  void set_home_provider(const Operator &oper);
 
   const std::string &meid() const { return meid_; }
   void set_meid(const std::string &meid) { meid_ = meid; }
@@ -165,9 +154,6 @@
   const std::string &imsi() const { return imsi_; }
   void set_imsi(const std::string &imsi) { imsi_ = imsi; }
 
-  const std::string &spn() const { return gsm_.spn; }
-  void set_spn(const std::string &spn) { gsm_.spn = spn; }
-
   const std::string &mdn() const { return mdn_; }
   void set_mdn(const std::string &mdn) { mdn_ = mdn; }
 
@@ -176,19 +162,13 @@
 
   ProxyFactory *proxy_factory() const { return proxy_factory_; }
 
-  void SetGSMAccessTechnology(uint32 access_technology);
-
   void HandleNewSignalQuality(uint32 strength);
 
   // Processes a change in the modem registration state, possibly creating,
   // destroying or updating the CellularService.
   void HandleNewRegistrationState();
 
-  void HandleNewCDMAActivationState(uint32 error);
-
-  // Updates the GSM operator name and country based on a newly obtained network
-  // id.
-  void UpdateGSMOperatorInfo();
+  void OnModemManagerPropertiesChanged(const DBusPropertiesMap &properties);
 
   // Inherited from Device.
   virtual void Start();
@@ -212,42 +192,15 @@
   friend class CellularCapabilityGSMTest;
   FRIEND_TEST(CellularTest, CreateService);
   FRIEND_TEST(CellularTest, Connect);
-  FRIEND_TEST(CellularTest, GetCDMAActivationStateString);
-  FRIEND_TEST(CellularTest, GetCDMAActivationErrorString);
   FRIEND_TEST(CellularTest, GetModemInfo);
   FRIEND_TEST(CellularTest, GetModemStatus);
   FRIEND_TEST(CellularTest, GetTypeString);
   FRIEND_TEST(CellularTest, InitProxiesCDMA);
   FRIEND_TEST(CellularTest, InitProxiesGSM);
-  FRIEND_TEST(CellularTest, SetGSMAccessTechnology);
   FRIEND_TEST(CellularTest, StartConnected);
   FRIEND_TEST(CellularTest, StartCDMARegister);
   FRIEND_TEST(CellularTest, StartGSMRegister);
   FRIEND_TEST(CellularTest, StartLinked);
-  FRIEND_TEST(CellularTest, UpdateGSMOperatorInfo);
-
-  struct CDMA {
-    CDMA();
-
-    uint32 activation_state;
-
-    uint16 prl_version;
-    std::string payment_url;
-    std::string usage_url;
-  };
-
-  struct GSM {
-    GSM();
-
-    uint32 access_technology;
-    std::string network_id;
-    std::string operator_name;
-    std::string operator_country;
-    std::string spn;
-  };
-
-  static const char kPhoneNumberCDMA[];
-  static const char kPhoneNumberGSM[];
 
   void SetState(State state);
 
@@ -269,9 +222,6 @@
 
   std::string GetTypeString() const;
 
-  static std::string GetCDMAActivationStateString(uint32 state);
-  static std::string GetCDMAActivationErrorString(uint32 error);
-
   void EnableModem();
   void GetModemStatus();
 
@@ -282,9 +232,6 @@
 
   void CreateService();
 
-  // Updates the serving operator on the active service.
-  void UpdateServingOperator();
-
   // Signal callbacks inherited from ModemProxyDelegate.
   virtual void OnModemStateChanged(uint32 old_state,
                                    uint32 new_state,
@@ -306,9 +253,6 @@
 
   mobile_provider_db *provider_db_;
 
-  CDMA cdma_;
-  GSM gsm_;
-
   CellularServiceRefPtr service_;
 
   ScopedRunnableMethodFactory<Cellular> task_factory_;