Split ServiceRegistryAndroid into InterfaceRegistryAndroid and InterfaceProviderAndroid

chrome/android/java/src/org/chromium/chrome/browser/mojo/ChromeInterfaceRegistrar.java

Index: chrome/android/java/src/org/chromium/chrome/browser/mojo/ChromeInterfaceRegistrar.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/mojo/ChromeServiceRegistrar.java b/chrome/android/java/src/org/chromium/chrome/browser/mojo/ChromeInterfaceRegistrar.java
similarity index 56%
rename from chrome/android/java/src/org/chromium/chrome/browser/mojo/ChromeServiceRegistrar.java
rename to chrome/android/java/src/org/chromium/chrome/browser/mojo/ChromeInterfaceRegistrar.java
index 76af5f40e4349c5e4620ba158b595da083b19086..6fb722662f010ce79baaf2c82965c6e345ffb794 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/mojo/ChromeServiceRegistrar.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/mojo/ChromeInterfaceRegistrar.java
@@ -6,17 +6,17 @@ package org.chromium.chrome.browser.mojo;
 
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.chrome.browser.payments.PaymentRequestFactory;
-import org.chromium.content.browser.ServiceRegistry;
+import org.chromium.content.browser.InterfaceRegistry;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.mojom.payments.PaymentRequest;
 
 /**
- * Registers mojo services exposed by Chrome in the given registry.
+ * Registers interfaces exposed by Chrome in the given registry.
  */
-class ChromeServiceRegistrar {
+class ChromeInterfaceRegistrar {
     @CalledByNative
-    private static void registerRenderFrameMojoServices(
-            ServiceRegistry registry, WebContents webContents) {
-        registry.addService(PaymentRequest.MANAGER, new PaymentRequestFactory(webContents));
+    private static void exposeInterfacesToFrame(
+            InterfaceRegistry registry, WebContents webContents) {
+        registry.addInterface(PaymentRequest.MANAGER, new PaymentRequestFactory(webContents));
     }
 }