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

content/browser/frame_host/frame_mojo_shell.h

Index: content/browser/frame_host/frame_mojo_shell.h
diff --git a/content/browser/frame_host/frame_mojo_shell.h b/content/browser/frame_host/frame_mojo_shell.h
index 893ade427f448f7c563f98e228e3e92e8d0128ed..08b313f0f606b55336eacca53fcc861ef8f13bb3 100644
--- a/content/browser/frame_host/frame_mojo_shell.h
+++ b/content/browser/frame_host/frame_mojo_shell.h
@@ -36,13 +36,13 @@ class FrameMojoShell : public mojo::shell::mojom::Connector {
       const mojo::shell::mojom::Connector::ConnectCallback& callback) override;
   void Clone(mojo::shell::mojom::ConnectorRequest request) override;
 
-  ServiceRegistryImpl* GetServiceRegistry();
+  BrowserServiceRegistryImpl* GetServiceRegistry();
 
   RenderFrameHost* frame_host_;
   mojo::BindingSet<mojo::shell::mojom::Connector> connectors_;
 
   // ServiceRegistry providing browser services to connected applications.
-  scoped_ptr<ServiceRegistryImpl> service_registry_;
+  scoped_ptr<BrowserServiceRegistryImpl> service_registry_;
   mojo::BindingSet<mojo::shell::mojom::InterfaceProvider>
       service_provider_bindings_;