Rename ServiceProvider to InterfaceProvider.

content/child/mojo/mojo_application.cc

Index: content/child/mojo/mojo_application.cc
diff --git a/content/child/mojo/mojo_application.cc b/content/child/mojo/mojo_application.cc
index fd0260d69fabcf44de3cdf9ff9ba4b547f8a1baf..1d344bb3f2f0174277f001c32e51dc994e6b2cb1 100644
--- a/content/child/mojo/mojo_application.cc
+++ b/content/child/mojo/mojo_application.cc
@@ -55,11 +55,11 @@ void MojoApplication::OnMessagePipeCreated(mojo::ScopedMessagePipeHandle pipe) {
   application_setup.Bind(
       mojo::InterfacePtrInfo<ApplicationSetup>(std::move(pipe), 0u));
 
-  mojo::ServiceProviderPtr services;
-  mojo::ServiceProviderPtr exposed_services;
+  mojo::InterfaceProviderPtr services;

[Marijn Kruisselbrink, 2016/02/10 00:41:43]

drive-by comment: in some places you've renamed service and exposed_services to
interfaces and exposed_interfaces, but in many other places you haven't. It
probably makes sense to change all services/exposed_services
attributes/parameter names to interfaces?

+  mojo::InterfaceProviderPtr exposed_services;
   service_registry_.Bind(GetProxy(&exposed_services));
-  application_setup->ExchangeServiceProviders(GetProxy(&services),
-                                              std::move(exposed_services));
+  application_setup->ExchangeInterfaceProviders(GetProxy(&services),
+                                                std::move(exposed_services));
   service_registry_.BindRemoteServiceProvider(std::move(services));
 }