| Index: chrome/service/service_process.cc
|
| diff --git a/chrome/service/service_process.cc b/chrome/service/service_process.cc
|
| index 3e3b8d81b826301b5791eb7901b8f31b4c6b33a0..c040d1a55585e96f89c84ec822d132b5159088d8 100644
|
| --- a/chrome/service/service_process.cc
|
| +++ b/chrome/service/service_process.cc
|
| @@ -170,7 +170,8 @@ bool ServiceProcess::Initialize(base::MessageLoopForUI* message_loop,
|
| 3, "ServiceBlocking", base::TaskPriority::USER_VISIBLE);
|
|
|
| // Initialize Mojo early so things can use it.
|
| - mojo::edk::Init();
|
| + // mojo::edk::Init() is called in InitializeMojo() via
|
| + // ContentMainRunnerImpl::Initialize(), so do not call it here.
|
| mojo_ipc_support_.reset(
|
| new mojo::edk::ScopedIPCSupport(io_thread_->task_runner()));
|
|
|
|
|