commit 1272a43bf73f6a99f51a6cc6345183aa503cfb67
author Darin Petkov <petkov@chromium.org> Thu Nov 10 15:53:37 2011 +0100
committer Gerrit <chrome-bot@google.com> Fri Nov 11 07:57:44 2011 -0800
tree ccb4fef5bdc3125fa448cfcc9ee972bb31b45913
parent 3e509242f1a0e2e018a5c18a8d7b9224c6044d9a

shill: Move network scanning to capability delegates.

Mostly refactor only. This patch also moves networks_found and scanning
properties registration from the device to the GSM capability delegate.

BUG=chromium-os:18735
TEST=unit tests

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

cellular.h

diff --git a/cellular.h b/cellular.h
index 3c0ffe8..5f280cd 100644
--- a/cellular.h
+++ b/cellular.h
@@ -137,6 +137,8 @@
   const SimLockStatus &sim_lock_status() const { return sim_lock_status_; }
   void set_sim_lock_status(const SimLockStatus &s) { sim_lock_status_ = s; }
 
+  mobile_provider_db *provider_db() const { return provider_db_; }
+
   const std::string &dbus_owner() const { return dbus_owner_; }
   const std::string &dbus_path() const { return dbus_path_; }
 
@@ -217,12 +219,9 @@
   FRIEND_TEST(CellularTest, GetTypeString);
   FRIEND_TEST(CellularTest, InitProxiesCDMA);
   FRIEND_TEST(CellularTest, InitProxiesGSM);
-  FRIEND_TEST(CellularTest, ParseScanResult);
-  FRIEND_TEST(CellularTest, ParseScanResultProviderLookup);
   FRIEND_TEST(CellularTest, RegisterOnNetwork);
   FRIEND_TEST(CellularTest, RegisterOnNetworkError);
   FRIEND_TEST(CellularTest, SetGSMAccessTechnology);
-  FRIEND_TEST(CellularTest, Scan);
   FRIEND_TEST(CellularTest, StartConnected);
   FRIEND_TEST(CellularTest, StartCDMARegister);
   FRIEND_TEST(CellularTest, StartGSMRegister);
@@ -252,18 +251,12 @@
     std::string spn;
   };
 
-  static const char kNetworkPropertyAccessTechnology[];
-  static const char kNetworkPropertyID[];
-  static const char kNetworkPropertyLongName[];
-  static const char kNetworkPropertyShortName[];
-  static const char kNetworkPropertyStatus[];
   static const char kPhoneNumberCDMA[];
   static const char kPhoneNumberGSM[];
 
   void SetState(State state);
 
   void ConnectTask(const DBusPropertiesMap &properties);
-  void ScanTask();
   void ActivateTask(const std::string &carrier);
   void RegisterOnNetworkTask(const std::string &network_id);
 
@@ -315,9 +308,6 @@
   // Updates the serving operator on the active service.
   void UpdateServingOperator();
 
-  Stringmap ParseScanResult(
-      const ModemGSMNetworkProxyInterface::ScanResult &result);
-
   // Signal callbacks inherited from ModemCDMAProxyDelegate.
   virtual void OnCDMAActivationStateChanged(
       uint32 activation_state,
@@ -377,10 +367,7 @@
   std::string manufacturer_;
   std::string firmware_revision_;
   std::string hardware_revision_;
-  bool scanning_;
-  uint16 scan_interval_;
   std::string selected_network_;
-  Stringmaps found_networks_;
   SimLockStatus sim_lock_status_;
   Operator home_provider_;