shill: Rename MergeService to ConfigureService
Collateral changes: Use ContainsService internally to profile's
ConfigureService. Refrain from using Service::GetStorageIdentifier
directly. I can think of scenarios coming up where it is important
for the Service to determine for itself whether a StorageInterface
contains anything it can use.
BUG=chromium-os:22422
TEST=ReRun Unit Tests
Change-Id: I34c6cb272c1540ab1e8d8d9bed4083b52e20f75e
Reviewed-on: https://gerrit.chromium.org/gerrit/11099
Commit-Ready: Paul Stewart <pstew@chromium.org>
Reviewed-by: Paul Stewart <pstew@chromium.org>
Tested-by: Paul Stewart <pstew@chromium.org>
diff --git a/profile_unittest.cc b/profile_unittest.cc
index 99be2bc..f352671 100644
--- a/profile_unittest.cc
+++ b/profile_unittest.cc
@@ -177,7 +177,7 @@
ASSERT_FALSE(profile_->ContainsService(service2));
}
-TEST_F(ProfileTest, ServiceMerge) {
+TEST_F(ProfileTest, ServiceConfigure) {
ServiceRefPtr service1(new ServiceUnderTest(control_interface(),
dispatcher(),
manager()));
@@ -191,7 +191,7 @@
dispatcher(),
manager()));
bool orig_favorite = service2->favorite();
- ASSERT_TRUE(profile_->MergeService(service2));
+ ASSERT_TRUE(profile_->ConfigureService(service2));
ASSERT_EQ(service1->favorite(), service2->favorite());
ASSERT_NE(orig_favorite, service2->favorite());