Split ServiceRegistryAndroid into InterfaceRegistryAndroid and InterfaceProviderAndroid

content/shell/android/java/src/org/chromium/content_shell/ShellMojoTestUtils.java

Index: content/shell/android/java/src/org/chromium/content_shell/ShellMojoTestUtils.java
diff --git a/content/shell/android/java/src/org/chromium/content_shell/ShellMojoTestUtils.java b/content/shell/android/java/src/org/chromium/content_shell/ShellMojoTestUtils.java
index b50e1a7ab25d245531f64390feeb1a167148bfef..853094e0989a54aa714145fee0126d1ff4761022 100644
--- a/content/shell/android/java/src/org/chromium/content_shell/ShellMojoTestUtils.java
+++ b/content/shell/android/java/src/org/chromium/content_shell/ShellMojoTestUtils.java
@@ -6,11 +6,13 @@ package org.chromium.content_shell;
 
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
-import org.chromium.content.browser.ServiceRegistry;
+import org.chromium.content.browser.InterfaceProvider;
+import org.chromium.content.browser.InterfaceRegistry;
 import org.chromium.mojo.system.Pair;
 
 /**
- * Test hooks for Mojo service support in the browser. See http://crbug.com/415945.
+ * Test hooks for shell InterfaceRegistry/Provider support in the browser.
+ * See http://crbug.com/415945.
  */
 @JNINamespace("content")
 public class ShellMojoTestUtils {
@@ -23,15 +25,15 @@ public class ShellMojoTestUtils {
     }
 
     /**
-     * Yields two ServiceRegistries bound to each other.
+     * Returns an InterfaceRegistry and an InterfaceProvider bound to it.
      */
-    public static Pair<ServiceRegistry, ServiceRegistry> createServiceRegistryPair(
+    public static Pair<InterfaceRegistry, InterfaceProvider> createInterfaceRegistryAndProvider(
             long testEnvironment) {
-        // Declaring parametrized return type for nativeCreateServiceRegistryPair() breaks the JNI
-        // generator. TODO(ppi): support parametrized return types in the JNI generator.
+        // Declaring parametrized return type for nativeCreateInterfaceRegistryAndProvider() breaks
+        // the JNI generator. TODO(ppi): support parametrized return types in the JNI generator.
         @SuppressWarnings("unchecked")
-        Pair<ServiceRegistry, ServiceRegistry> pair =
-                nativeCreateServiceRegistryPair(testEnvironment);
+        Pair<InterfaceRegistry, InterfaceProvider> pair =
+                nativeCreateInterfaceRegistryAndProvider(testEnvironment);
         return pair;
     }
 
@@ -40,13 +42,12 @@ public class ShellMojoTestUtils {
     }
 
     @CalledByNative
-    public static Pair makePair(ServiceRegistry serviceRegistryA,
-            ServiceRegistry serviceRegistryB) {
-        return new Pair<ServiceRegistry, ServiceRegistry>(serviceRegistryA, serviceRegistryB);
+    public static Pair makePair(InterfaceRegistry registry, InterfaceProvider provider) {
+        return new Pair<InterfaceRegistry, InterfaceProvider>(registry, provider);
     }
 
     private static native long nativeSetupTestEnvironment();
     private static native void nativeTearDownTestEnvironment(long testEnvironment);
-    private static native Pair nativeCreateServiceRegistryPair(long testEnvironment);
+    private static native Pair nativeCreateInterfaceRegistryAndProvider(long testEnvironment);
     private static native void nativeRunLoop(long timeoutMs);
 }