Revert of Init Mojo embedder for Windows NaCl plugins.

components/nacl/loader/nacl_listener.cc

 // Copyright 2013 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 "components/nacl/loader/nacl_listener.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
@@ skipping 410 matching lines @@
 #if defined(OS_LINUX)
   args->prereserved_sandbox_size = prereserved_sandbox_size_;
 #endif
 
   base::PlatformFile nexe_file = IPC::PlatformFileForTransitToPlatformFile(
       params.nexe_file);
   std::string file_path_str = params.nexe_file_path_metadata.AsUTF8Unsafe();
   args->nexe_desc = NaClDescCreateWithFilePathMetadata(nexe_file,
                                                        file_path_str.c_str());
 
+#if defined(OS_POSIX)
   if (params.enable_mojo) {
+#if !defined(OS_MACOSX)
+    // Don't call mojo::embedder::Init on Mac; it's already been called from
+    // ChromeMain() (see chrome/app/chrome_exe_main_mac.cc).
+    mojo::embedder::Init(make_scoped_ptr(
+        new mojo::embedder::SimplePlatformSupport()));
+#endif
     // InjectMojo adds a file descriptor to the process that allows Mojo calls
     // to use an implementation defined outside the NaCl sandbox. See
     // //mojo/nacl for implementation details.
     InjectMojo(nap);
   } else {
     // When Mojo isn't enabled, we inject a file descriptor that intentionally
     // fails on any imc_sendmsg() call to make debugging easier.
     InjectDisabledMojo(nap);
   }
+#else
+  InjectDisabledMojo(nap);
+#endif
   // TODO(yusukes): Support pre-opening resource files.
   CHECK(params.prefetched_resource_files.empty());
 
   int exit_status;
   if (!NaClChromeMainStart(nap, args, &exit_status))
     NaClExit(1);
 
   // Report the plugin's exit status if the application started successfully.
   trusted_listener_->Send(new NaClRendererMsg_ReportExitStatus(exit_status));
   NaClExit(exit_status);
@@ skipping 11 matching lines @@
 }
 
 void NaClListener::OnFileTokenResolved(
     uint64_t token_lo,
     uint64_t token_hi,
     IPC::PlatformFileForTransit ipc_fd,
     base::FilePath file_path) {
   resolved_cb_.Run(ipc_fd, file_path);
   resolved_cb_.Reset();
 }