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

content/browser/mojo/mojo_application_host.h

 // Copyright 2014 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_BROWSER_MOJO_MOJO_APPLICATION_HOST_H_
 #define CONTENT_BROWSER_MOJO_MOJO_APPLICATION_HOST_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process/process_handle.h"
@@ skipping 41 matching lines @@
   void OverrideIOTaskRunnerForTest(
       scoped_refptr<base::TaskRunner> io_task_runner);
 
  private:
   ChannelInit channel_init_;
   mojo::edk::ScopedPlatformHandle client_handle_;
 
   bool did_activate_;
 
   scoped_ptr<mojom::ApplicationSetup> application_setup_;
-  ServiceRegistryImpl service_registry_;
+  BrowserServiceRegistryImpl service_registry_;
 
   scoped_refptr<base::TaskRunner> io_task_runner_override_;
 
-#if defined(OS_ANDROID)
-  scoped_ptr<ServiceRegistryAndroid> service_registry_android_;
-#endif
-
   DISALLOW_COPY_AND_ASSIGN(MojoApplicationHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_MOJO_MOJO_APPLICATION_HOST_H_