| Index: content/app/content_main_runner.cc
|
| diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
|
| index e9aebce43157352adb791f8f559fbb2b89d4b532..1f3cc2437df18886044308802e2c6e6f58f81070 100644
|
| --- a/content/app/content_main_runner.cc
|
| +++ b/content/app/content_main_runner.cc
|
| @@ -26,6 +26,7 @@
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/strings/string_util.h"
|
| #include "base/strings/stringprintf.h"
|
| +#include "content/app/mojo/mojo_init.h"
|
| #include "content/browser/browser_main.h"
|
| #include "content/common/set_process_title.h"
|
| #include "content/common/url_schemes.h"
|
| @@ -63,7 +64,6 @@
|
| #endif
|
|
|
| #if !defined(OS_IOS)
|
| -#include "content/app/mojo/mojo_init.h"
|
| #include "content/browser/gpu/gpu_process_host.h"
|
| #include "content/browser/renderer_host/render_process_host_impl.h"
|
| #include "content/browser/utility_process_host_impl.h"
|
| @@ -612,10 +612,8 @@ class ContentMainRunnerImpl : public ContentMainRunner {
|
| std::string process_type =
|
| command_line.GetSwitchValueASCII(switches::kProcessType);
|
|
|
| -#if !defined(OS_IOS)
|
| // Initialize mojo here so that services can be registered.
|
| InitializeMojo();
|
| -#endif
|
|
|
| if (!GetContentClient())
|
| SetContentClient(&empty_content_client_);
|
|
|