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 fc0693a6449f346f69009d4caace814b2c18cd00..216b65ac43b8658af35b3ed3491d6ea9c2d8a4a7 100644 |
--- a/content/browser/mojo/mojo_application_host.h |
+++ b/content/browser/mojo/mojo_application_host.h |
@@ -8,8 +8,8 @@ |
#include "base/memory/scoped_ptr.h" |
#include "base/process/process_handle.h" |
#include "content/common/application_setup.mojom.h" |
+#include "content/common/mojo/channel_init.h" |
#include "content/common/mojo/service_registry_impl.h" |
-#include "third_party/mojo/src/mojo/edk/embedder/channel_init.h" |
#include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h" |
#if defined(OS_ANDROID) |
@@ -48,8 +48,11 @@ class CONTENT_EXPORT MojoApplicationHost { |
} |
#endif |
+ void OverrideIOTaskRunnerForTest( |
+ scoped_refptr<base::TaskRunner> io_task_runner); |
+ |
private: |
- mojo::embedder::ChannelInit channel_init_; |
+ ChannelInit channel_init_; |
mojo::embedder::ScopedPlatformHandle client_handle_; |
bool did_activate_; |
@@ -57,6 +60,8 @@ class CONTENT_EXPORT MojoApplicationHost { |
scoped_ptr<ApplicationSetup> application_setup_; |
ServiceRegistryImpl service_registry_; |
+ scoped_refptr<base::TaskRunner> io_task_runner_override_; |
+ |
#if defined(OS_ANDROID) |
scoped_ptr<ServiceRegistryAndroid> service_registry_android_; |
#endif |