Change RenderFrame to use InterfaceRegistry et al.

extensions/browser/mojo/service_registration.cc

Index: extensions/browser/mojo/service_registration.cc
diff --git a/extensions/browser/mojo/service_registration.cc b/extensions/browser/mojo/service_registration.cc
index d6091eafcdbe7a70fd9fd69c157675784c082ee0..6bbc1472df3c08955bfe3374ec41e99d89588931 100644
--- a/extensions/browser/mojo/service_registration.cc
+++ b/extensions/browser/mojo/service_registration.cc
@@ -20,6 +20,7 @@
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_api.h"
 #include "extensions/common/switches.h"
+#include "services/shell/public/cpp/interface_registry.h"
 
 #if defined(ENABLE_WIFI_DISPLAY)
 #include "extensions/browser/api/display_source/wifi_display/wifi_display_media_service_impl.h"
@@ -47,26 +48,26 @@ void RegisterServicesForFrame(content::RenderFrameHost* render_frame_host,
                               const Extension* extension) {
   DCHECK(extension);
 
-  content::ServiceRegistry* service_registry =
-      render_frame_host->GetServiceRegistry();
+  shell::InterfaceRegistry* registry =
+      render_frame_host->GetInterfaceRegistry();
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableMojoSerialService)) {
     if (ExtensionHasPermission(extension, render_frame_host->GetProcess(),
                                "serial")) {
-      service_registry->AddService(base::Bind(&BindToSerialServiceRequest));
+      registry->AddInterface(base::Bind(&BindToSerialServiceRequest));
     }
   }
-  service_registry->AddService(base::Bind(
+  registry->AddInterface(base::Bind(
       KeepAliveImpl::Create,
       render_frame_host->GetProcess()->GetBrowserContext(), extension));
 
 #if defined(ENABLE_WIFI_DISPLAY)
   if (ExtensionHasPermission(extension, render_frame_host->GetProcess(),
                              "displaySource")) {
-    service_registry->AddService(
+    registry->AddInterface(
         base::Bind(WiFiDisplaySessionServiceImpl::BindToRequest,
                    render_frame_host->GetProcess()->GetBrowserContext()));
-    service_registry->AddService(
+    registry->AddInterface(
         base::Bind(WiFiDisplayMediaServiceImpl::BindToRequest));
   }
 #endif