Rename ServiceProvider to InterfaceProvider.

mojo/shell/package_manager/content_handler_connection.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 "mojo/shell/package_manager/content_handler_connection.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 10 matching lines @@
     ApplicationManager* manager,
     const Identity& source,
     const Identity& content_handler,
     uint32_t id,
     const ClosedCallback& connection_closed_callback)
     : connection_closed_callback_(connection_closed_callback),
       identity_(content_handler),
       connection_closed_(false),
       id_(id),
       ref_count_(0) {
-  ServiceProviderPtr services;
+  InterfaceProviderPtr remote_interfaces;
 
   scoped_ptr<ConnectToApplicationParams> params(new ConnectToApplicationParams);
   params->set_source(source);
   params->SetTarget(identity_);
-  params->set_services(GetProxy(&services));
+  params->set_remote_interfaces(GetProxy(&remote_interfaces));
   manager->ConnectToApplication(std::move(params));
 
   MessagePipe pipe;
   content_handler_.Bind(
       InterfacePtrInfo<mojom::ContentHandler>(std::move(pipe.handle0), 0u));
-  services->ConnectToService(mojom::ContentHandler::Name_,
-                             std::move(pipe.handle1));
+  remote_interfaces->GetInterface(mojom::ContentHandler::Name_,
+                                  std::move(pipe.handle1));
   content_handler_.set_connection_error_handler(
       [this]() { CloseConnection(); });
 }
 
 void ContentHandlerConnection::StartApplication(
     InterfaceRequest<mojom::ShellClient> request,
     URLResponsePtr response) {
   content_handler_->StartApplication(
       std::move(request), std::move(response),
       base::Bind(&ContentHandlerConnection::ApplicationDestructed,
@@ skipping 15 matching lines @@
   DCHECK(connection_closed_);
 }
 
 void ContentHandlerConnection::ApplicationDestructed() {
   if (!--ref_count_)
     CloseConnection();
 }
 
 }  // namespace shell
 }  // namespace mojo