Rename ServiceProvider to InterfaceProvider.

content/browser/frame_host/frame_mojo_shell.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/frame_host/frame_mojo_shell.h"
 
 #include <utility>
 
 #include "build/build_config.h"
 #include "content/browser/mojo/mojo_shell_context.h"
@@ skipping 31 matching lines @@
 void FrameMojoShell::BindRequest(
     mojo::InterfaceRequest<mojo::shell::mojom::Shell> shell_request) {
   bindings_.AddBinding(this, std::move(shell_request));
 }
 
 // TODO(xhwang): Currently no callers are exposing |exposed_services|. So we
 // drop it and replace it with services we provide in the browser. In the
 // future we may need to support both.
 void FrameMojoShell::ConnectToApplication(
     mojo::URLRequestPtr application_url,
-    mojo::InterfaceRequest<mojo::ServiceProvider> services,
-    mojo::ServiceProviderPtr /* exposed_services */,
+    mojo::InterfaceRequest<mojo::InterfaceProvider> services,
+    mojo::InterfaceProviderPtr /* exposed_services */,
     mojo::shell::mojom::CapabilityFilterPtr filter,
     const ConnectToApplicationCallback& callback) {
-  mojo::ServiceProviderPtr frame_services;
+  mojo::InterfaceProviderPtr frame_services;
   service_provider_bindings_.AddBinding(GetServiceRegistry(),
                                         GetProxy(&frame_services));
 
   mojo::shell::CapabilityFilter capability_filter =
       mojo::shell::GetPermissiveCapabilityFilter();
   if (!filter.is_null())
     capability_filter = filter->filter.To<mojo::shell::CapabilityFilter>();
   MojoShellContext::ConnectToApplication(
       GURL(application_url->url.get()),
       frame_host_->GetSiteInstance()->GetSiteURL(), std::move(services),
@@ skipping 12 matching lines @@
     // different services for different apps for better isolation.
     RegisterFrameMojoShellServices(service_registry_.get(), frame_host_);
     GetContentClient()->browser()->RegisterFrameMojoShellServices(
         service_registry_.get(), frame_host_);
   }
 
   return service_registry_.get();
 }
 
 }  // namespace content