Split ServiceRegistryAndroid into InterfaceRegistryAndroid and InterfaceProviderAndroid

content/browser/mojo/interface_registrar_android.cc

Index: content/browser/mojo/interface_registrar_android.cc
diff --git a/content/browser/mojo/service_registrar_android.cc b/content/browser/mojo/interface_registrar_android.cc
similarity index 54%
rename from content/browser/mojo/service_registrar_android.cc
rename to content/browser/mojo/interface_registrar_android.cc
index cd0cfacf81883ef2dd4c35a3913e191778ecc203..ca14541c27ff96e10c856bc516e95dafa618f084 100644
--- a/content/browser/mojo/service_registrar_android.cc
+++ b/content/browser/mojo/interface_registrar_android.cc
@@ -2,33 +2,33 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/mojo/service_registrar_android.h"
+#include "content/browser/mojo/interface_registrar_android.h"
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
-#include "content/public/browser/android/service_registry_android.h"
-#include "jni/ServiceRegistrar_jni.h"
+#include "content/public/browser/android/interface_registry_android.h"
+#include "jni/InterfaceRegistrar_jni.h"
 
 namespace content {
 
 // static
-bool ServiceRegistrarAndroid::Register(JNIEnv* env) {
+bool InterfaceRegistrarAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 // static
-void ServiceRegistrarAndroid::RegisterProcessHostServices(
-    ServiceRegistryAndroid* registry) {
+void InterfaceRegistrarAndroid::ExposeInterfacesToRenderer(
+    InterfaceRegistryAndroid* registry) {
   JNIEnv* env = base::android::AttachCurrentThread();
-  Java_ServiceRegistrar_registerProcessHostServices(
+  Java_InterfaceRegistrar_exposeInterfacesToRenderer(
       env, registry->GetObj().obj(), base::android::GetApplicationContext());
 }
 
 // static
-void ServiceRegistrarAndroid::RegisterFrameHostServices(
-    ServiceRegistryAndroid* registry) {
+void InterfaceRegistrarAndroid::ExposeInterfacesToFrame(
+  InterfaceRegistryAndroid* registry) {
   JNIEnv* env = base::android::AttachCurrentThread();
-  Java_ServiceRegistrar_registerFrameHostServices(
+  Java_InterfaceRegistrar_exposeInterfacesToFrame(
       env, registry->GetObj().obj(), base::android::GetApplicationContext());
 }
 }  // namespace content