shill: Refactor Manager's Get*Service to support both VPN and WiFi types.

BUG=chromium-os:22063
TEST=unit tests

Change-Id: I1f9ae822af8a22a59dda0c159a5f3471dcda2a89
Reviewed-on: https://gerrit.chromium.org/gerrit/16479
Commit-Ready: Darin Petkov <petkov@chromium.org>
Reviewed-by: Darin Petkov <petkov@chromium.org>
Tested-by: Darin Petkov <petkov@chromium.org>
diff --git a/manager_dbus_adaptor.h b/manager_dbus_adaptor.h
index 9020429..c9e0390 100644
--- a/manager_dbus_adaptor.h
+++ b/manager_dbus_adaptor.h
@@ -63,14 +63,15 @@
   void EnableTechnology(const std::string &, ::DBus::Error &error);
   void DisableTechnology(const std::string &, ::DBus::Error &error);
 
-  ::DBus::Path GetService(const std::map<std::string, ::DBus::Variant> &,
+  ::DBus::Path GetService(const std::map<std::string, ::DBus::Variant> &args,
                           ::DBus::Error &error);
-  ::DBus::Path GetWifiService(const std::map<std::string, ::DBus::Variant> &,
-                              ::DBus::Error &error);
+  ::DBus::Path GetVPNService(const std::map<std::string, ::DBus::Variant> &args,
+                             ::DBus::Error &error);
+  ::DBus::Path GetWifiService(
+      const std::map<std::string, ::DBus::Variant> &args,
+      ::DBus::Error &error);
   void ConfigureWifiService(const std::map<std::string, ::DBus::Variant> &,
                             ::DBus::Error &error);
-  ::DBus::Path GetVPNService(const std::map< std::string, ::DBus::Variant> &,
-                             ::DBus::Error &error);
 
   void RegisterAgent(const ::DBus::Path &, ::DBus::Error &error);
   void UnregisterAgent(const ::DBus::Path &, ::DBus::Error &error);