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>

1 files changed, 5 insertions, 3 deletions

diff --git a/profile.h b/profile.h
index abde66a8..b694eefc 100644
--- a/profile.h
+++ b/profile.h
@@ -81,10 +81,12 @@ class Profile : public base::RefCounted<Profile> {
   // Returns true if |service| was found and updated, false if not found.
   bool UpdateService(const ServiceRefPtr &service);
 
-  // Determine if |service| represents a service that's already in |services_|.
-  // If so, merge them smartly and return true.  If not, return false.
-  bool MergeService(const ServiceRefPtr &service);
+  // Ask |service| if it can configure itself from the profile.  If it can,
+  // change the service to point at this profile, ask |service| to perform
+  // the configuration and return true.  If not, return false.
+  bool ConfigureService(const ServiceRefPtr &service);
 
+  // Return whether |service| can configure itself from the profile.
   bool ContainsService(const ServiceConstRefPtr &service);
 
   std::vector<std::string> EnumerateAvailableServices();