commit 81030eaefea1b37aa67c3934d17cd6ded9be569d
author David Rochberg <rochberg@chromium.org> Fri Mar 02 15:44:25 2012 -0500
committer Gerrit <chrome-bot@google.com> Tue Mar 06 08:26:48 2012 -0800
tree 2b0b2f6cc4a7f93e90f8f563e2678c4fca8f9eac
parent 605967453c2bfe1340fdfbee1bebe6526d1a9bc6

Split ModemManager into ModemManagerBase and ModemManagerClassic

This is in preparation for building ModemManager1 to support the MM0.6
interface.

BUG=chromium-os:27014
TEST=unit tests, ran shill across multiple cromo restarts

Change-Id: I718c9508d81e12481be44cdaf5453679e08b905e
Reviewed-on: https://gerrit.chromium.org/gerrit/17249
Commit-Ready: David Rochberg <rochberg@chromium.org>
Reviewed-by: David Rochberg <rochberg@chromium.org>
Tested-by: David Rochberg <rochberg@chromium.org>

modem_manager_proxy.h

diff --git a/modem_manager_proxy.h b/modem_manager_proxy.h
index 348dabf..2b261a6 100644
--- a/modem_manager_proxy.h
+++ b/modem_manager_proxy.h
@@ -15,14 +15,14 @@
 
 namespace shill {
 
-class ModemManager;
+class ModemManagerClassic;
 
 // There's a single proxy per ModemManager service identified by its DBus |path|
 // and owner name |service|.
 class ModemManagerProxy : public ModemManagerProxyInterface {
  public:
   ModemManagerProxy(DBus::Connection *connection,
-                    ModemManager *manager,
+                    ModemManagerClassic *manager,
                     const std::string &path,
                     const std::string &service);
   virtual ~ModemManagerProxy();
@@ -35,7 +35,7 @@
                 public DBus::ObjectProxy {
    public:
     Proxy(DBus::Connection *connection,
-          ModemManager *manager,
+          ModemManagerClassic *manager,
           const std::string &path,
           const std::string &service);
     virtual ~Proxy();
@@ -49,7 +49,7 @@
     // [None]
 
     // The owner of this proxy.
-    ModemManager *manager_;
+    ModemManagerClassic *manager_;
 
     DISALLOW_COPY_AND_ASSIGN(Proxy);
   };