Rename ServiceProvider to InterfaceProvider.

mojo/shell/public/cpp/lib/application_test_base.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 <utility>
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/environment/environment.h"
@@ skipping 35 matching lines @@
                   const mojo::String& url,
                   uint32_t id) override {
     g_url = url;
     g_id = id;
     g_shell_client_request = binding_.Unbind();
     g_shell = std::move(shell);
   }
 
   void AcceptConnection(const String& requestor_url,
                         uint32_t requestor_id,
-                        InterfaceRequest<ServiceProvider> services,
-                        ServiceProviderPtr exposed_services,
+                        InterfaceRequest<InterfaceProvider> local_interfaces,
+                        InterfaceProviderPtr remote_interfaces,
                         Array<String> allowed_interfaces,
                         const String& url) override {
     MOJO_CHECK(false);
   }
 
   void OnQuitRequested(const Callback<void(bool)>& callback) override {
     MOJO_CHECK(false);
   }
 
   Binding<ShellClient> binding_;
@@ skipping 96 matching lines @@
   if (ShouldCreateDefaultRunLoop())
     Environment::DestroyDefaultRunLoop();
 }
 
 bool ApplicationTestBase::ShouldCreateDefaultRunLoop() {
   return true;
 }
 
 }  // namespace test
 }  // namespace mojo