commit 25665aa52da9f6e08a23fc462b09c2ae63a8a5f2
author Darin Petkov <petkov@chromium.org> Mon May 21 14:08:12 2012 +0200
committer Gerrit <chrome-bot@google.com> Mon May 21 10:08:02 2012 -0700
tree 99611c423ca48d5bff6a8eca41f4843d9c608535
parent 7904d1443656999fd0a7faaf247aad05a7b3e0a6

shill: Cleanup some leaks of DBus-specific types into core shill code.

Also, generalize DBusAdaptor::KeyValueStoreToVariant a bit by using a
more complete DBusProperties::ConvertKeyValueStoreToMap method and add
unit tests.

BUG=chrome-os-partner:9837
TEST=unit tests

Change-Id: Ie8396bc2b0e46b2982360b2af5c34950a1b1015d
Reviewed-on: https://gerrit.chromium.org/gerrit/23122
Tested-by: Darin Petkov <petkov@chromium.org>
Reviewed-by: Jason Glasgow <jglasgow@chromium.org>
Reviewed-by: Ben Chan <benchan@chromium.org>
Commit-Ready: Darin Petkov <petkov@chromium.org>

mock_wimax_device_proxy.h

diff --git a/mock_wimax_device_proxy.h b/mock_wimax_device_proxy.h
index 3ff2c0b..2b1412a 100644
--- a/mock_wimax_device_proxy.h
+++ b/mock_wimax_device_proxy.h
@@ -26,8 +26,8 @@
   MOCK_METHOD3(ScanNetworks, void(Error *error,
                                   const ResultCallback &callback,
                                   int timeout));
-  MOCK_METHOD5(Connect, void(const DBus::Path &network,
-                             const DBusPropertiesMap &parameters,
+  MOCK_METHOD5(Connect, void(const RpcIdentifier &network,
+                             const KeyValueStore &parameters,
                              Error *error,
                              const ResultCallback &callback,
                              int timeout));