Rename ServiceProvider to InterfaceProvider.

content/browser/mojo/mojo_application_host.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/browser/mojo/mojo_application_host.h"
 
 #include <utility>
 
 #include "build/build_config.h"
 #include "content/common/mojo/mojo_messages.h"
@@ skipping 18 matching lines @@
   ApplicationSetupImpl(ServiceRegistryImpl* service_registry,
                        mojo::InterfaceRequest<ApplicationSetup> request)
       : binding_(this, std::move(request)),
         service_registry_(service_registry) {}
 
   ~ApplicationSetupImpl() override {
   }
 
  private:
   // ApplicationSetup implementation.
-  void ExchangeServiceProviders(
-      mojo::InterfaceRequest<mojo::ServiceProvider> services,
-      mojo::ServiceProviderPtr exposed_services) override {
+  void ExchangeInterfaceProviders(
+      mojo::InterfaceRequest<mojo::InterfaceProvider> services,
+      mojo::InterfaceProviderPtr exposed_services) override {
     service_registry_->Bind(std::move(services));
     service_registry_->BindRemoteServiceProvider(std::move(exposed_services));
   }
 
   mojo::Binding<ApplicationSetup> binding_;
   ServiceRegistryImpl* service_registry_;
 };
 
 }  // namespace
 
@@ skipping 56 matching lines @@
 
 void MojoApplicationHost::OnMessagePipeCreated(
     mojo::ScopedMessagePipeHandle pipe) {
   DCHECK(pipe.is_valid());
   application_setup_.reset(new ApplicationSetupImpl(
       &service_registry_,
       mojo::MakeRequest<ApplicationSetup>(std::move(pipe))));
 }
 
 }  // namespace content