Rename ServiceProvider to InterfaceProvider.

content/child/mojo/mojo_application.cc

 // Copyright 2014 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/child/mojo/mojo_application.h"
 
 #include <utility>
 
 #include "build/build_config.h"
 #include "content/child/child_process.h"
@@ skipping 37 matching lines @@
                                 weak_factory_.GetWeakPtr()));
 }
 
 void MojoApplication::OnMessagePipeCreated(mojo::ScopedMessagePipeHandle pipe) {
   DCHECK(pipe.is_valid());
 
   ApplicationSetupPtr application_setup;
   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));
 }
 
 }  // namespace content