Index: content/app/content_main_runner.cc |
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc |
index 957d604ea190d0d0b167d145d9c09b56aad99326..adf27a995f24aa552dedf8e2b20f06511ac4082e 100644 |
--- a/content/app/content_main_runner.cc |
+++ b/content/app/content_main_runner.cc |
@@ -101,10 +101,6 @@ |
} |
#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) |
@@ -533,7 +529,7 @@ |
virtual int Initialize(const ContentMainParams& params) OVERRIDE { |
ui_task_ = params.ui_task; |
-#if defined(OS_WIN) |
+#if defined(OS_WIN) |
RegisterInvalidParamHandler(); |
_Module.Init(NULL, static_cast<HINSTANCE>(params.instance)); |
@@ -664,11 +660,6 @@ |
const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
std::string process_type = |
command_line.GetSwitchValueASCII(switches::kProcessType); |
- |
-#if defined(USE_MOJO) |
- // Initialize mojo here so that services can be registered. |
- InitializeMojo(); |
-#endif |
if (!GetContentClient()) |
SetContentClient(&empty_content_client_); |