| Index: content/app/content_main_runner.cc
|
| diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
|
| index d64eb45f0fc5db9b4d569fe4d110a9efb9e5a0a8..a00066f98eb9f38334445579538d7dce1a7257d7 100644
|
| --- a/content/app/content_main_runner.cc
|
| +++ b/content/app/content_main_runner.cc
|
| @@ -61,6 +61,7 @@
|
| #endif
|
|
|
| #if !defined(OS_IOS)
|
| +#include "content/app/mojo/mojo_init.h"
|
| #include "content/public/plugin/content_plugin_client.h"
|
| #include "content/public/renderer/content_renderer_client.h"
|
| #include "content/public/utility/content_utility_client.h"
|
| @@ -101,10 +102,6 @@ int tc_set_new_mode(int mode);
|
| }
|
| #endif
|
|
|
| -#if defined(USE_MOJO)
|
| -#include "content/app/mojo/mojo_init.h"
|
| -#endif
|
| -
|
| namespace content {
|
| extern int GpuMain(const content::MainFunctionParams&);
|
| #if defined(ENABLE_PLUGINS)
|
| @@ -665,7 +662,7 @@ class ContentMainRunnerImpl : public ContentMainRunner {
|
| std::string process_type =
|
| command_line.GetSwitchValueASCII(switches::kProcessType);
|
|
|
| -#if defined(USE_MOJO)
|
| +#if !defined(OS_IOS)
|
| // Initialize mojo here so that services can be registered.
|
| InitializeMojo();
|
| #endif
|
| @@ -812,7 +809,7 @@ class ContentMainRunnerImpl : public ContentMainRunner {
|
| delegate_->ProcessExiting(process_type);
|
| }
|
|
|
| -#if defined(USE_MOJO)
|
| +#if !defined(OS_IOS)
|
| ShutdownMojo();
|
| #endif
|
|
|
|
|