| Index: trunk/src/content/common/mojo/mojo_channel_init.cc
|
| ===================================================================
|
| --- trunk/src/content/common/mojo/mojo_channel_init.cc (revision 258768)
|
| +++ trunk/src/content/common/mojo/mojo_channel_init.cc (working copy)
|
| @@ -20,7 +20,16 @@
|
| }
|
| };
|
|
|
| +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
|
|
|
| MojoChannelInit::MojoChannelInit()
|
| @@ -37,16 +46,6 @@
|
| }
|
| }
|
|
|
| -// 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) {
|
|
|