commit e0a312e2f3b4e213c8872b86a9f3117a066d2e91
author Darin Petkov <petkov@chromium.org> Wed Jul 20 13:45:28 2011 -0700
committer Darin Petkov <petkov@chromium.org> Tue Jul 26 10:21:41 2011 -0700
tree 2048adac85fbfcde85c96dff9f28f349090a5905
parent 8a7b8be27dd4570b182fb7ea1b4c5c9f107f3f8b

shill: Create and register a Cellular device for each ModemManager.Modem.

BUG=chromium-os:17818
TEST=unit tests

Change-Id: Ic35adf35c8021f4c9689e72ddd03776948d036c1
Reviewed-on: http://gerrit.chromium.org/gerrit/4711
Reviewed-by: Darin Petkov <petkov@chromium.org>
Tested-by: Darin Petkov <petkov@chromium.org>

modem.h

diff --git a/modem.h b/modem.h
index a8f6adf..110d8f7 100644
--- a/modem.h
+++ b/modem.h
@@ -9,17 +9,24 @@
 
 #include <base/basictypes.h>
 #include <base/memory/scoped_ptr.h>
+#include <gtest/gtest_prod.h>  // for FRIEND_TEST
+
+#include "shill/dbus_properties_proxy_interface.h"
+#include "shill/refptr_types.h"
 
 namespace shill {
 
 class ControlInterface;
-class DBusPropertiesProxyInterface;
 class EventDispatcher;
 class Manager;
 
-// Handles an instance of ModemManager.Modem and an instance of CellularDevice.
+// Handles an instance of ModemManager.Modem and an instance of a Cellular
+// device.
 class Modem {
  public:
+  // |owner| is the ModemManager DBus service owner (e.g., ":1.17"). |path| is
+  // the ModemManager.Modem DBus object path (e.g.,
+  // "/org/chromium/ModemManager/Gobi/0").
   Modem(const std::string &owner,
         const std::string &path,
         ControlInterface *control_interface,
@@ -27,9 +34,32 @@
         Manager *manager);
   ~Modem();
 
+  // Initializes support for the modem, possibly constructing a Cellular device.
+  void Init();
+
  private:
+  friend class ModemManagerTest;
+  friend class ModemTest;
+  FRIEND_TEST(ModemTest, CreateCellularDevice);
+  FRIEND_TEST(ModemTest, Init);
+
+  static const char kPropertyLinkName[];
+  static const char kPropertyIPMethod[];
+  static const char kPropertyType[];
+  static const char kPropertyUnlockRequired[];
+  static const char kPropertyUnlockRetries[];
+
+  void CreateCellularDevice(const DBusPropertiesMap &properties);
+
+  // A proxy to the org.freedesktop.DBus.Properties interface used to obtain
+  // ModemManager.Modem properties and watch for property changes.
   scoped_ptr<DBusPropertiesProxyInterface> dbus_properties_proxy_;
 
+  const std::string owner_;
+  const std::string path_;
+
+  CellularRefPtr device_;
+
   ControlInterface *control_interface_;
   EventDispatcher *dispatcher_;
   Manager *manager_;