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

content/browser/frame_host/render_frame_host_impl.h

Index: content/browser/frame_host/render_frame_host_impl.h
diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h
index acef076ae2f1c4b7bc2b61fd40f5fc29ce772670..d1a274fd189aed8d9be44cffab73c7db8da6bdca 100644
--- a/content/browser/frame_host/render_frame_host_impl.h
+++ b/content/browser/frame_host/render_frame_host_impl.h
@@ -160,7 +160,7 @@ class CONTENT_EXPORT RenderFrameHostImpl : public RenderFrameHost,
   void ActivateFindInPageResultForAccessibility(int request_id) override;
   void InsertVisualStateCallback(const VisualStateCallback& callback) override;
   RenderViewHost* GetRenderViewHost() override;
-  ServiceRegistry* GetServiceRegistry() override;
+  BrowserServiceRegistry* GetServiceRegistry() override;
   blink::WebPageVisibilityState GetVisibilityState() override;
   bool IsRenderFrameLive() override;
   int GetProxyCount() override;
@@ -893,11 +893,7 @@ class CONTENT_EXPORT RenderFrameHostImpl : public RenderFrameHost,
   // SiteInstance.
   scoped_ptr<TimeoutMonitor> swapout_event_monitor_timeout_;
 
-  scoped_ptr<ServiceRegistryImpl> service_registry_;
-
-#if defined(OS_ANDROID)
-  scoped_ptr<ServiceRegistryAndroid> service_registry_android_;
-#endif
+  scoped_ptr<BrowserServiceRegistryImpl> service_registry_;
 
   scoped_ptr<WebBluetoothServiceImpl> web_bluetooth_service_;