Strawman proposal for dealing with Android java mojo services registry in browser code

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 721ec566bf0349839ed937f83946cbf04614fb4d..6d9124e5523a16c85701d6c16df584d1b2b745a0 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -103,6 +103,7 @@ class BrowserContext;
 class BrowserMainParts;
 class BrowserPluginGuestDelegate;
 class BrowserPpapiHost;
+class BrowserServiceRegistry;
 class BrowserURLHandler;
 class ClientCertificateDelegate;
 class DevToolsManagerDelegate;
@@ -117,7 +118,6 @@ class RenderFrameHost;
 class RenderProcessHost;
 class RenderViewHost;
 class ResourceContext;
-class ServiceRegistry;
 class SiteInstance;
 class SpeechRecognitionManagerDelegate;
 class TracingDelegate;
@@ -648,18 +648,18 @@ class CONTENT_EXPORT ContentBrowserClient {
 
   // Allows to register browser Mojo services exposed through the
   // RenderProcessHost.
-  virtual void RegisterRenderProcessMojoServices(ServiceRegistry* registry) {}
+  virtual void RegisterRenderProcessMojoServices(BrowserServiceRegistry* registry) {}
 
   // Allows to register browser Mojo services exposed through the
   // FrameMojoShell.
   virtual void RegisterFrameMojoShellServices(
-      ServiceRegistry* registry,
+      BrowserServiceRegistry* registry,
       RenderFrameHost* render_frame_host) {}
 
   // Allows to register browser Mojo services exposed through the
   // RenderFrameHost.
   virtual void RegisterRenderFrameMojoServices(
-      ServiceRegistry* registry,
+      BrowserServiceRegistry* registry,
       RenderFrameHost* render_frame_host) {}
 
   using StaticMojoApplicationMap =