Index: content/renderer/renderer_main.cc |
diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc |
index 8fb158d3182e26fb24b50155296d20330e04ded9..13368c92a04f7e22c52ded693f7febb822833557 100644 |
--- a/content/renderer/renderer_main.cc |
+++ b/content/renderer/renderer_main.cc |
@@ -94,12 +94,13 @@ int RendererMain(const MainFunctionParams& parameters) { |
base::trace_event::TraceLog::GetInstance()->SetProcessSortIndex( |
kTraceEventRendererProcessSortIndex); |
+ const base::CommandLine& parsed_command_line = parameters.command_line; |
+ |
#if defined(MOJO_SHELL_CLIENT) |
- MojoShellConnectionImpl::Create(); |
+ if (parsed_command_line.HasSwitch(switches::kEnableMojoShellConnection)) |
+ MojoShellConnectionImpl::Create(); |
#endif |
- const base::CommandLine& parsed_command_line = parameters.command_line; |
- |
#if defined(OS_MACOSX) |
base::mac::ScopedNSAutoreleasePool* pool = parameters.autorelease_pool; |
#endif // OS_MACOSX |