Initialize mojo once in non-SFI NaCl.

ppapi/nacl_irt/plugin_startup.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ppapi/nacl_irt/plugin_startup.h"
 
 #include "base/bind.h"
 #include "base/file_descriptor_posix.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "ipc/ipc_channel_handle.h"
-#include "mojo/edk/embedder/embedder.h"
 #include "ppapi/nacl_irt/manifest_service.h"
 #include "ppapi/shared_impl/ppb_audio_shared.h"
 
 namespace ppapi {
 namespace {
 
 IPC::ChannelHandle* g_nacl_browser_ipc_handle = nullptr;
 IPC::ChannelHandle* g_nacl_renderer_ipc_handle = nullptr;
 IPC::ChannelHandle* g_manifest_service_handle = nullptr;
 
@@ skipping 37 matching lines @@
   g_nacl_browser_ipc_handle = new IPC::ChannelHandle(browser_ipc_handle);
   g_nacl_renderer_ipc_handle = new IPC::ChannelHandle(renderer_ipc_handle);
   g_manifest_service_handle = new IPC::ChannelHandle(manifest_service_handle);
 }
 
 void StartUpPlugin() {
   // The start up must be called only once.
   DCHECK(!g_shutdown_event);
   DCHECK(!g_io_thread);
 
-  // The Mojo EDK must be initialized before using IPC.
-  mojo::edk::Init();
-
   g_shutdown_event =
       new base::WaitableEvent(base::WaitableEvent::ResetPolicy::MANUAL,
                               base::WaitableEvent::InitialState::NOT_SIGNALED);
   g_io_thread = new base::Thread("Chrome_NaClIOThread");
   g_io_thread->StartWithOptions(
       base::Thread::Options(base::MessageLoop::TYPE_IO, 0));
 
   if (IsValidChannelHandle(g_manifest_service_handle)) {
     // Manifest service must be created on IOThread so that the main message
     // handling will be done on the thread, which has a message loop
@@ skipping 33 matching lines @@
   // The IOThread must be initialized in advance.
   DCHECK(g_io_thread);
   return g_io_thread;
 }
 
 ManifestService* GetManifestService() {
   return g_manifest_service;
 }
 
 }  // namespace ppapi