shill: Add CellularCapabilityUniversal
Add the CellularCapabilityUniversal class so that shill can talk to a
ModemManager1 DBUS interface. Ensure that a modems can be created
with either the new or the old modem manager running.
Register to receive DBus property changes from ModemManager1
BUG=chromium-os:28596, chromium-os:26650
TEST=Run unit tests, test that modem is created with Y3300
Change-Id: I8717318e944589bc85e763bd7234336559256dbc
Reviewed-on: https://gerrit.chromium.org/gerrit/19888
Commit-Ready: Jason Glasgow <jglasgow@chromium.org>
Reviewed-by: Jason Glasgow <jglasgow@chromium.org>
Tested-by: Jason Glasgow <jglasgow@chromium.org>
diff --git a/cellular.h b/cellular.h
index 1c31831..472fa48 100644
--- a/cellular.h
+++ b/cellular.h
@@ -6,6 +6,7 @@
#define SHILL_CELLULAR_
#include <string>
+#include <vector>
#include <base/basictypes.h>
#include <gtest/gtest_prod.h> // for FRIEND_TEST
@@ -143,6 +144,10 @@
// destroying or updating the CellularService.
void HandleNewRegistrationState();
+ virtual void OnDBusPropertiesChanged(
+ const std::string &interface,
+ const DBusPropertiesMap &changed_properties,
+ const std::vector<std::string> &invalidated_properties);
virtual void OnModemManagerPropertiesChanged(
const DBusPropertiesMap &properties);
@@ -181,6 +186,7 @@
friend class CellularCapabilityTest;
friend class CellularCapabilityCDMATest;
friend class CellularCapabilityGSMTest;
+ friend class CellularServiceTest;
friend class ModemTest;
FRIEND_TEST(CellularCapabilityCDMATest, CreateFriendlyServiceName);
FRIEND_TEST(CellularCapabilityCDMATest, GetRegistrationState);