Change RenderFrame to use InterfaceRegistry et al.

content/browser/android/service_registry_android_impl.h

Index: content/browser/android/service_registry_android_impl.h
diff --git a/content/browser/android/service_registry_android_impl.h b/content/browser/android/service_registry_android_impl.h
index 2620313c801369cd22330a81e73c15c869bba124..ee14de2b9d8228b383b210b74ef810a2661f508e 100644
--- a/content/browser/android/service_registry_android_impl.h
+++ b/content/browser/android/service_registry_android_impl.h
@@ -22,7 +22,9 @@ class ServiceRegistryAndroidImpl : public ServiceRegistryAndroid {
   friend class ServiceRegistryAndroid;
 
   // Use ServiceRegistryAndroid::Create() to create an instance.
-  explicit ServiceRegistryAndroidImpl(ServiceRegistry* service_registry);
+  explicit ServiceRegistryAndroidImpl(
+      shell::InterfaceRegistry* interface_registry,
+      shell::InterfaceProvider* remote_interfaces);
 
   // ServiceRegistryAndroid implementation:
   void AddService(
@@ -42,7 +44,8 @@ class ServiceRegistryAndroidImpl : public ServiceRegistryAndroid {
       jint handle) override;
   const base::android::ScopedJavaGlobalRef<jobject>& GetObj() override;
 
-  ServiceRegistry* service_registry_;
+  shell::InterfaceRegistry* interface_registry_;
+  shell::InterfaceProvider* remote_interfaces_;
   base::android::ScopedJavaGlobalRef<jobject> obj_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceRegistryAndroidImpl);