Rename ServiceProvider to InterfaceProvider.

content/shell/browser/shell_mojo_test_utils_android.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/shell/browser/shell_mojo_test_utils_android.h"
 
 #include <utility>
 
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 30 matching lines @@
     const JavaParamRef<jclass>& jcaller,
     jlong native_test_environment) {
   TestEnvironment* test_environment =
       reinterpret_cast<TestEnvironment*>(native_test_environment);
 
   content::ServiceRegistryImpl* registry_a = new ServiceRegistryImpl();
   test_environment->registries.push_back(registry_a);
   content::ServiceRegistryImpl* registry_b = new ServiceRegistryImpl();
   test_environment->registries.push_back(registry_b);
 
-  mojo::ServiceProviderPtr exposed_services_a;
+  mojo::InterfaceProviderPtr exposed_services_a;
   registry_a->Bind(GetProxy(&exposed_services_a));
   registry_b->BindRemoteServiceProvider(std::move(exposed_services_a));
 
-  mojo::ServiceProviderPtr exposed_services_b;
+  mojo::InterfaceProviderPtr exposed_services_b;
   registry_b->Bind(GetProxy(&exposed_services_b));
   registry_a->BindRemoteServiceProvider(std::move(exposed_services_b));
 
   content::ServiceRegistryAndroid* wrapper_a =
       new ServiceRegistryAndroid(registry_a);
   test_environment->wrappers.push_back(wrapper_a);
   content::ServiceRegistryAndroid* wrapper_b =
       new ServiceRegistryAndroid(registry_b);
   test_environment->wrappers.push_back(wrapper_b);
 
   return Java_ShellMojoTestUtils_makePair(env, wrapper_a->GetObj().obj(),
                                           wrapper_b->GetObj().obj());
 }
 
 static void RunLoop(JNIEnv* env,
                     const JavaParamRef<jclass>& jcaller,
                     jlong timeout_ms) {
   base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(),
       base::TimeDelta::FromMilliseconds(timeout_ms));
   base::RunLoop run_loop;
   run_loop.Run();
 }
 
 bool RegisterShellMojoTestUtils(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content