Rename ServiceProvider to InterfaceProvider.

mojo/shell/package_manager/package_manager_impl.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/shell/package_manager/package_manager_impl.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 132 matching lines @@
   if (url.SchemeIs(url::kDataScheme)) {
     DataFetcher::Start(url, loader_callback);
     return;
   }
 
   GURL resolved_url = ResolveURL(url);
   if (resolved_url.SchemeIsFile()) {
     // LocalFetcher uses the network service to infer MIME types from URLs.
     // Skip this for mojo URLs to avoid recursively loading the network service.
     if (!network_service_ && !url.SchemeIs("mojo") && !url.SchemeIs("exe")) {
-      ConnectToService(application_manager_, GURL("mojo:network_service"),
-                       &network_service_);
+      ConnectToInterface(application_manager_, GURL("mojo:network_service"),
+                         &network_service_);
     }
     // Ownership of this object is transferred to |loader_callback|.
     // TODO(beng): this is eff'n weird.
     new LocalFetcher(network_service_.get(), resolved_url,
                      GetBaseURLAndQuery(resolved_url, nullptr),
                      shell_file_root_, loader_callback);
 
     // TODO(beng): Determine if this is in the right place, and block
     //             establishing the connection on receiving a complete manifest.
     EnsureURLInCatalog(url);
     return;
   }
 
   if (!url_loader_factory_) {
-    ConnectToService(application_manager_, GURL("mojo:network_service"),
-                     &url_loader_factory_);
+    ConnectToInterface(application_manager_, GURL("mojo:network_service"),
+                       &url_loader_factory_);
   }
 
   // Ownership of this object is transferred to |loader_callback|.
   // TODO(beng): this is eff'n weird.
   new NetworkFetcher(disable_cache_, std::move(request),
                      url_loader_factory_.get(), loader_callback);
 }
 
 uint32_t PackageManagerImpl::HandleWithContentHandler(
     Fetcher* fetcher,
@@ skipping 200 matching lines @@
     return;
 
   base::DictionaryValue* dictionary = nullptr;
   CHECK(manifest->GetAsDictionary(&dictionary));
   DeserializeApplication(dictionary);
   SerializeCatalog();
 }
 
 }  // namespace shell
 }  // namespace mojo