| Index: content/common/mojo/mojo_channel_init.cc
|
| diff --git a/content/common/mojo/mojo_channel_init.cc b/content/common/mojo/mojo_channel_init.cc
|
| index 088a8e9508e8789f64dd47c6d8246a60421374d6..295cb6db21d743a17063da8ee49043f1d48fdf5d 100644
|
| --- a/content/common/mojo/mojo_channel_init.cc
|
| +++ b/content/common/mojo/mojo_channel_init.cc
|
| @@ -20,15 +20,6 @@ struct Initializer {
|
| }
|
| };
|
|
|
| -static base::LazyInstance<Initializer>::Leaky initializer =
|
| - LAZY_INSTANCE_INITIALIZER;
|
| -
|
| -// Initializes mojo. Use a lazy instance to ensure we only do this once.
|
| -// TODO(sky): this likely wants to move to a more central location, such as
|
| -// startup.
|
| -void InitMojo() {
|
| - initializer.Get();
|
| -}
|
|
|
| } // namespace
|
|
|
| @@ -46,6 +37,16 @@ MojoChannelInit::~MojoChannelInit() {
|
| }
|
| }
|
|
|
| +// static
|
| +void MojoChannelInit::InitMojo() {
|
| + static base::LazyInstance<Initializer>::Leaky initializer =
|
| + LAZY_INSTANCE_INITIALIZER;
|
| + // Initializes mojo. Use a lazy instance to ensure we only do this once.
|
| + // TODO(sky): this likely wants to move to a more central location, such as
|
| + // startup.
|
| + initializer.Get();
|
| +}
|
| +
|
| void MojoChannelInit::Init(
|
| base::PlatformFile file,
|
| scoped_refptr<base::TaskRunner> io_thread_task_runner) {
|
|
|