Split ServiceRegistryAndroid into InterfaceRegistryAndroid and InterfaceProviderAndroid

content/browser/mojo/mojo_child_connection.h

Index: content/browser/mojo/mojo_child_connection.h
diff --git a/content/browser/mojo/mojo_child_connection.h b/content/browser/mojo/mojo_child_connection.h
index c51f67e40b5e6806baaf60de6f94356b0b85b47e..02c3daa3e48c071abacc493b77f8e7ee399db3f7 100644
--- a/content/browser/mojo/mojo_child_connection.h
+++ b/content/browser/mojo/mojo_child_connection.h
@@ -18,7 +18,7 @@
 #include "services/shell/public/interfaces/connector.mojom.h"
 
 #if defined(OS_ANDROID)
-#include "content/public/browser/android/service_registry_android.h"
+#include "content/public/browser/android/interface_registry_android.h"
 #endif
 
 namespace shell {
@@ -63,8 +63,8 @@ class MojoChildConnection {
   void SetProcessHandle(base::ProcessHandle handle);
 
 #if defined(OS_ANDROID)
-  ServiceRegistryAndroid* service_registry_android() {
-    return service_registry_android_.get();
+  InterfaceRegistryAndroid* interface_registry_android() {
+    return interface_registry_android_.get();
   }
 #endif
 
@@ -82,7 +82,7 @@ class MojoChildConnection {
   shell::InterfaceProvider remote_interfaces_;
 
 #if defined(OS_ANDROID)
-  std::unique_ptr<ServiceRegistryAndroid> service_registry_android_;
+  std::unique_ptr<InterfaceRegistryAndroid> interface_registry_android_;
 #endif
 
   base::WeakPtrFactory<MojoChildConnection> weak_factory_;