commit b65c24574109b331150f376f117e10948acc7123
author Darin Petkov <petkov@chromium.org> Thu Feb 23 15:17:06 2012 +0100
committer Gerrit <chrome-bot@google.com> Thu Feb 23 12:24:56 2012 -0800
tree c3df904692b58d7c23568af30d4d69848ffec6e5
parent 20088d860631a67c151a12783fbbee63c708792f

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>

manager.h

diff --git a/manager.h b/manager.h
index f1ed565..92f3294 100644
--- a/manager.h
+++ b/manager.h
@@ -84,7 +84,7 @@
   std::vector<std::string> EnumerateAvailableServices(Error *error);
 
   // called via RPC (e.g., from ManagerDBusAdaptor)
-  WiFiServiceRefPtr GetWifiService(const KeyValueStore &args, Error *error);
+  ServiceRefPtr GetService(const KeyValueStore &args, Error *error);
   void RequestScan(const std::string &technology, Error *error);
   std::string GetTechnologyOrder();
   void SetTechnologyOrder(const std::string &order, Error *error);
@@ -148,7 +148,12 @@
   FRIEND_TEST(ManagerTest, SortServices);
   FRIEND_TEST(ManagerTest, SortServicesWithConnection);
 
-  static const char kManagerErrorNoDevice[];
+  static const char kErrorNoDevice[];
+  static const char kErrorTypeRequired[];
+  static const char kErrorUnsupportedServiceType[];
+
+  WiFiServiceRefPtr GetWifiService(const KeyValueStore &args, Error *error);
+  ServiceRefPtr GetVPNService(const KeyValueStore &args, Error *error);
 
   std::string CalculateState(Error *error);
   void AutoConnect();