Rename ServiceProvider to InterfaceProvider.

content/browser/mojo/mojo_app_connection_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 "content/browser/mojo/mojo_app_connection_impl.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 13 matching lines @@
     const GURL& url,
     const GURL& requestor_url) {
   return scoped_ptr<MojoAppConnection>(
       new MojoAppConnectionImpl(url, requestor_url));
 }
 
 MojoAppConnectionImpl::MojoAppConnectionImpl(const GURL& url,
                                              const GURL& requestor_url) {
   MojoShellContext::ConnectToApplication(
       url, requestor_url, mojo::GetProxy(&services_),
-      mojo::ServiceProviderPtr(), mojo::shell::GetPermissiveCapabilityFilter(),
+      mojo::InterfaceProviderPtr(),
+      mojo::shell::GetPermissiveCapabilityFilter(),
       base::Bind(&OnGotRemoteIDs));
 }
 
 MojoAppConnectionImpl::~MojoAppConnectionImpl() {
 }
 
 void MojoAppConnectionImpl::ConnectToService(
     const std::string& service_name,
     mojo::ScopedMessagePipeHandle handle) {
-  services_->ConnectToService(service_name, std::move(handle));
+  services_->GetInterface(service_name, std::move(handle));
 }
 
 }  // namespace content