Change RenderFrame to use InterfaceRegistry et al.

content/public/browser/android/service_registry_android.h

Index: content/public/browser/android/service_registry_android.h
diff --git a/content/public/browser/android/service_registry_android.h b/content/public/browser/android/service_registry_android.h
index e134b431ab7ded23f5f6ebc8721d31da40b33c5b..a89e006e238f556b1071cedac1c47bd2f11c6bb9 100644
--- a/content/public/browser/android/service_registry_android.h
+++ b/content/public/browser/android/service_registry_android.h
@@ -11,6 +11,11 @@
 #include "base/android/scoped_java_ref.h"
 #include "content/common/content_export.h"
 
+namespace shell {
+class InterfaceRegistry;
+class InterfaceProvider;
+}
+
 namespace content {
 
 class ServiceRegistry;
@@ -23,7 +28,11 @@ class CONTENT_EXPORT ServiceRegistryAndroid {
 
   // The |registry| parameter must outlive |ServiceRegistryAndroid|.
   static std::unique_ptr<ServiceRegistryAndroid> Create(
-      ServiceRegistry* registry);
+      shell::InterfaceRegistry* interface_registry,
+      shell::InterfaceProvider* remote_interfaces);
+
+  static std::unique_ptr<ServiceRegistryAndroid> Create(
+      ServiceRegistry* service_registry);
 
   // Called from Java.
   virtual void AddService(