Change RenderFrame to use InterfaceRegistry et al.

content/public/browser/content_browser_client.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
 
 #include <stddef.h>
 
 #include <map>
@@ skipping 43 matching lines @@
 
 namespace gfx {
 class ImageSkia;
 }
 
 namespace media {
 class CdmFactory;
 }
 
 namespace shell {
+class InterfaceRegistry;
 class ShellClient;
 }
 
 namespace net {
 class CookieOptions;
 class NetLog;
 class SSLCertRequestInfo;
 class SSLInfo;
 class URLRequest;
 class URLRequestContext;
@@ skipping 565 matching lines @@
   // Returns true if dev channel APIs are available for plugins.
   virtual bool IsPluginAllowedToUseDevChannelAPIs(
       BrowserContext* browser_context,
       const GURL& url);
 
   // Generate a Shell user-id for the supplied browser context. Defaults to
   // returning a random GUID.
   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>;
 
   // Registers Mojo applications to be loaded in the browser process by the
   // browser's global Mojo shell.
   virtual void RegisterInProcessMojoApplications(
       StaticMojoApplicationMap* apps) {}
 
   using OutOfProcessMojoApplicationMap = std::map<std::string, base::string16>;
@@ skipping 103 matching lines @@
   // Allows an embedder to provide its own ExternalVideoSurfaceContainer
   // implementation.  Return nullptr to disable external surface video.
   virtual ExternalVideoSurfaceContainer*
   OverrideCreateExternalVideoSurfaceContainer(WebContents* web_contents);
 #endif
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_