| Index: content/child/child_thread_impl.cc
|
| diff --git a/content/child/child_thread_impl.cc b/content/child/child_thread_impl.cc
|
| index c7dc71c6c6e14a6fa9bdfb99406ee512a3bf9c4c..2d8af69163c2148dbfc63513644c3cefec7496b5 100644
|
| --- a/content/child/child_thread_impl.cc
|
| +++ b/content/child/child_thread_impl.cc
|
| @@ -296,10 +296,11 @@ ChildThreadImpl::Options::Options()
|
| : channel_name(base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
|
| switches::kProcessChannelID)),
|
| use_mojo_channel(base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kMojoApplicationChannelToken)),
|
| + switches::kMojoApplicationChannelToken) ||
|
| + base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kMojoChannelToken)),
|
| auto_start_mojo_shell_connection(true),
|
| - connect_to_browser(false) {
|
| -}
|
| + connect_to_browser(false) {}
|
|
|
| ChildThreadImpl::Options::Options(const Options& other) = default;
|
|
|
|
|