commit fa1d31d532535043460dfcffd1e9f487d52bd3c4
author David Rochberg <rochberg@chromium.org> Tue Mar 20 10:38:07 2012 -0400
committer Gerrit <chrome-bot@google.com> Fri Mar 30 08:06:21 2012 -0700
tree 1726742fdfc039c565ccbf4c320fd1a40e39d4f4
parent e73d05ca690cc847f512072f4709c92cbd7b0651

Split Modem into ModemClassic and Modem1

Along the way:

  Restructure ModemManagerXxx to use the split modem classes.

  Add new mocks to limit scope of modem tests

  Change modem state enum to a neutral format and convert from MM1 and
  MMClassic to this format.

  Fix a bug where we weren't properly releasing a callback in
  DBusObjectManagerProxy.

  Add new DBus property matchers

BUG=chromium-os:27935,chromium-os:27936
TEST=unit tests

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

mock_dbus_objectmanager_proxy.h

diff --git a/mock_dbus_objectmanager_proxy.h b/mock_dbus_objectmanager_proxy.h
index fa6530e..07d6e02 100644
--- a/mock_dbus_objectmanager_proxy.h
+++ b/mock_dbus_objectmanager_proxy.h
@@ -24,6 +24,7 @@
       void(const InterfacesAddedSignalCallback &callback));
   MOCK_METHOD1(set_interfaces_removed_callback,
       void(const InterfacesRemovedSignalCallback &callback));
+  void IgnoreSetCallbacks();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockDBusObjectManagerProxy);