Rename ServiceProvider to InterfaceProvider.

mojo/shell/package_manager/content_handler_connection.cc

Index: mojo/shell/package_manager/content_handler_connection.cc
diff --git a/mojo/shell/package_manager/content_handler_connection.cc b/mojo/shell/package_manager/content_handler_connection.cc
index 2bddab0f609eb83b752e898293e68696abe81740..2c9e07b5e347e31dbf71b389e6c539989e17c46e 100644
--- a/mojo/shell/package_manager/content_handler_connection.cc
+++ b/mojo/shell/package_manager/content_handler_connection.cc
@@ -28,19 +28,19 @@ ContentHandlerConnection::ContentHandlerConnection(
       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(); });
 }