| Index: content/child/child_thread_impl.cc
|
| diff --git a/content/child/child_thread_impl.cc b/content/child/child_thread_impl.cc
|
| index 380d4410d4a955f55b068527463e7b4b93e5d8b3..8765532f651dfc89a2d7d322bc09c6f6d39a75bc 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;
|
|
|
|
|