[shill] Make profiles backed with StoreInterfaces
Rely on persistence of data in StoreInterface to maintain
Service/Device/IPConfig info for entities that are not
currently active, instead of maintaining lists in Profile
objects themselves.
BUG=chromium-os:17253
TEST=unit, run on device
Change-Id: I206f44ddf16c584354f8fcadb57032f047f33d0a
Reviewed-on: http://gerrit.chromium.org/gerrit/10024
Commit-Ready: Chris Masone <cmasone@chromium.org>
Reviewed-by: Chris Masone <cmasone@chromium.org>
Tested-by: Chris Masone <cmasone@chromium.org>
diff --git a/service_unittest.cc b/service_unittest.cc
index 42b6614..7b4b53d 100644
--- a/service_unittest.cc
+++ b/service_unittest.cc
@@ -22,7 +22,7 @@
#include "shill/mock_manager.h"
#include "shill/mock_store.h"
#include "shill/property_store_unittest.h"
-#include "shill/service.h"
+#include "shill/service_under_test.h"
using std::map;
using std::string;
@@ -36,32 +36,6 @@
namespace shill {
-// This is a simple Service subclass with all the pure-virutal methods stubbed
-class ServiceUnderTest : public Service {
- public:
- static const char kRpcId[];
- static const char kStorageId[];
-
- ServiceUnderTest(ControlInterface *control_interface,
- EventDispatcher *dispatcher,
- Manager *manager)
- : Service(control_interface, dispatcher, manager, "stub") {}
- virtual ~ServiceUnderTest() {}
-
- virtual void Connect(Error */*error*/) {}
- virtual void Disconnect() {}
- virtual string CalculateState() { return ""; }
- virtual string GetRpcIdentifier() const { return ServiceMockAdaptor::kRpcId; }
- virtual string GetDeviceRpcId() { return kRpcId; }
- virtual string GetStorageIdentifier() { return kStorageId; }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ServiceUnderTest);
-};
-
-const char ServiceUnderTest::kRpcId[] = "mock-device-rpc";
-const char ServiceUnderTest::kStorageId[] = "service";
-
class ServiceTest : public PropertyStoreTest {
public:
ServiceTest()