| Index: content/browser/mojo/mojo_application_host.h
|
| diff --git a/content/browser/mojo/mojo_application_host.h b/content/browser/mojo/mojo_application_host.h
|
| index f09c729e7d6607a97effe727b768c4821a9a8671..f73811602e89824ffb3f229933fca75dda412b2d 100644
|
| --- a/content/browser/mojo/mojo_application_host.h
|
| +++ b/content/browser/mojo/mojo_application_host.h
|
| @@ -15,10 +15,6 @@
|
| #include "mojo/edk/embedder/scoped_platform_handle.h"
|
| #include "mojo/public/cpp/system/message_pipe.h"
|
|
|
| -#if defined(OS_ANDROID)
|
| -#include "content/browser/mojo/service_registry_android.h"
|
| -#endif
|
| -
|
| namespace IPC {
|
| class Sender;
|
| }
|
| @@ -43,12 +39,6 @@ class CONTENT_EXPORT MojoApplicationHost {
|
|
|
| ServiceRegistry* service_registry() { return &service_registry_; }
|
|
|
| -#if defined(OS_ANDROID)
|
| - ServiceRegistryAndroid* service_registry_android() {
|
| - return service_registry_android_.get();
|
| - }
|
| -#endif
|
| -
|
| void OverrideIOTaskRunnerForTest(
|
| scoped_refptr<base::TaskRunner> io_task_runner);
|
|
|
| @@ -63,10 +53,6 @@ class CONTENT_EXPORT MojoApplicationHost {
|
|
|
| scoped_refptr<base::TaskRunner> io_task_runner_override_;
|
|
|
| -#if defined(OS_ANDROID)
|
| - scoped_ptr<ServiceRegistryAndroid> service_registry_android_;
|
| -#endif
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(MojoApplicationHost);
|
| };
|
|
|
|
|