shill: Merge supplicant's proxy factory into ProxyFactory.
BUG=chromium-os:16785
TEST=unit tests
Change-Id: I315ad64bcdee1a14edfc4f5485696f495c55e7b9
Reviewed-on: http://gerrit.chromium.org/gerrit/4271
Tested-by: Darin Petkov <petkov@chromium.org>
Reviewed-by: mukesh agrawal <quiche@chromium.org>
diff --git a/proxy_factory.h b/proxy_factory.h
index fffcd05..726c2ac 100644
--- a/proxy_factory.h
+++ b/proxy_factory.h
@@ -8,13 +8,16 @@
#include <string>
#include <base/basictypes.h>
+#include <dbus-c++/dbus.h>
+
+#include "shill/refptr_types.h"
namespace shill {
class ModemManager;
class ModemManagerProxyInterface;
-
-// TODO(petkov): Merge supplicant proxy factory into this one.
+class SupplicantInterfaceProxyInterface;
+class SupplicantProcessProxyInterface;
// Global DBus proxy factory that can be mocked out in tests.
class ProxyFactory {
@@ -27,6 +30,15 @@
const std::string &path,
const std::string &service);
+ virtual SupplicantProcessProxyInterface *CreateProcessProxy(
+ const char *dbus_path,
+ const char *dbus_addr);
+
+ virtual SupplicantInterfaceProxyInterface *CreateInterfaceProxy(
+ const WiFiRefPtr &wifi,
+ const DBus::Path &object_path,
+ const char *dbus_addr);
+
static ProxyFactory *factory() { return factory_; }
static void set_factory(ProxyFactory *factory) { factory_ = factory; }