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>

wimax_device_proxy_interface.h

diff --git a/wimax_device_proxy_interface.h b/wimax_device_proxy_interface.h
index b83a69f..7e97a8f 100644
--- a/wimax_device_proxy_interface.h
+++ b/wimax_device_proxy_interface.h
@@ -10,11 +10,11 @@
 #include <base/basictypes.h>
 
 #include "shill/callbacks.h"
-#include "shill/dbus_properties.h"
 
 namespace shill {
 
 class Error;
+class KeyValueStore;
 
 // These are the methods that a WiMaxManager.Device proxy must support. The
 // interface is provided so that it can be mocked in tests.
@@ -33,8 +33,8 @@
   virtual void ScanNetworks(Error *error,
                             const ResultCallback &callback,
                             int timeout) = 0;
-  virtual void Connect(const DBus::Path &network,
-                       const DBusPropertiesMap &parameters,
+  virtual void Connect(const RpcIdentifier &network,
+                       const KeyValueStore &parameters,
                        Error *error,
                        const ResultCallback &callback,
                        int timeout) = 0;