Change RenderFrame to use InterfaceRegistry et al.

content/public/browser/content_browser_client.h

Index: content/public/browser/content_browser_client.h
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 493cb42a3d185296c1e46b195e749016074f4b62..7aed5913a483149b0462bd4dd4dfa8a1c3e03fa4 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -61,6 +61,7 @@ class CdmFactory;
 }
 
 namespace shell {
+class InterfaceRegistry;
 class ShellClient;
 }
 
@@ -646,22 +647,22 @@ class CONTENT_EXPORT ContentBrowserClient {
   virtual std::string GetShellUserIdForBrowserContext(
       BrowserContext* browser_context);
 
-  // Allows to register browser Mojo services exposed through the
+  // Allows to register browser Mojo interfaces exposed through the
   // RenderProcessHost.
   virtual void RegisterRenderProcessMojoServices(
       ServiceRegistry* registry,
       RenderProcessHost* render_process_host) {}
 
-  // Allows to register browser Mojo services exposed through the
+  // Allows to register browser Mojo interfaces exposed through the
   // FrameMojoShell.
-  virtual void RegisterFrameMojoShellServices(
-      ServiceRegistry* registry,
+  virtual void RegisterFrameMojoShellInterfaces(
+      shell::InterfaceRegistry* registry,
       RenderFrameHost* render_frame_host) {}
 
-  // Allows to register browser Mojo services exposed through the
+  // Allows to register browser Mojo interfaces exposed through the
   // RenderFrameHost.
-  virtual void RegisterRenderFrameMojoServices(
-      ServiceRegistry* registry,
+  virtual void RegisterRenderFrameMojoInterfaces(
+      shell::InterfaceRegistry* registry,
       RenderFrameHost* render_frame_host) {}
 
   using StaticMojoApplicationMap = std::map<std::string, MojoApplicationInfo>;