Pepper: Remove Mojo integration and tests.

Given that we don't anticipate a need for many new Pepper APIs in the long term, and that using Mojo APIs through this interface would be complicated in the short term, it seems better to abandon this work. This removes all the supporting code (except mojo/nacl) to make it easy to see what has to be done if someone wants to restore this later.

BUG=414804
TBR=jcivelli

Review URL: https://codereview.chromium.org/1097143003

Cr-Commit-Position: refs/heads/master@{#326562}

12 files changed, 0 insertions, 49 deletions

diff --git a/components/nacl.gyp b/components/nacl.gyp
index 5888d75..9c8e2b3 100644
--- a/components/nacl.gyp
+++ b/components/nacl.gyp
@@ -73,11 +73,9 @@
             '../base/base.gyp:base_static',
             '../crypto/crypto.gyp:crypto',
             '../ipc/ipc.gyp:ipc',
-            '../mojo/mojo_nacl.gyp:monacl_syscall',
             '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel_main_chrome',
             '../ppapi/ppapi_internal.gyp:ppapi_ipc',
             '../ppapi/ppapi_internal.gyp:ppapi_shared',
-            '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
           ],
           'conditions': [
             ['disable_nacl_untrusted==0', {
@@ -227,7 +225,6 @@
               ],
               'dependencies': [
                 'nacl_linux',
-                '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
               ],
               'cflags': ['-fPIE'],
               'ldflags!': [
@@ -335,11 +332,9 @@
               },
               'dependencies': [
                 'nacl_common_win64',
-                '../mojo/mojo_nacl.gyp:monacl_syscall_win64',
                 '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel_main_chrome64',
                 '../ppapi/ppapi_internal.gyp:ppapi_shared_win64',
                 '../ppapi/ppapi_internal.gyp:ppapi_ipc_win64',
-                '../third_party/mojo/mojo_edk.gyp:mojo_system_impl_win64',
               ],
               'export_dependent_settings': [
                 '../ppapi/ppapi_internal.gyp:ppapi_ipc_win64',
diff --git a/components/nacl/BUILD.gn b/components/nacl/BUILD.gn
index cb4496f..5576df1 100644
--- a/components/nacl/BUILD.gn
+++ b/components/nacl/BUILD.gn
@@ -33,7 +33,6 @@ if (enable_nacl) {
       "//content/public/common",
       "//crypto",
       "//ipc",
-      "//mojo/nacl:monacl_sel",
       "//native_client/src/trusted/service_runtime:sel_main_chrome",
       "//ppapi/c",
       "//ppapi/proxy:ipc",
@@ -181,7 +180,6 @@ if (enable_nacl) {
         "//content/public/common",
         "//crypto",
         "//ipc",
-        "//mojo/nacl:monacl_sel",
         "//sandbox/linux:libc_urandom_override",
       ]
 
diff --git a/components/nacl/browser/nacl_process_host.cc b/components/nacl/browser/nacl_process_host.cc
index 0335029..2abf7a1 100644
--- a/components/nacl/browser/nacl_process_host.cc
+++ b/components/nacl/browser/nacl_process_host.cc
@@ -840,8 +840,6 @@ bool NaClProcessHost::StartNaClExecution() {
     params.validation_cache_key = nacl_browser->GetValidationCacheKey();
     params.version = NaClBrowser::GetDelegate()->GetVersionString();
     params.enable_debug_stub = enable_nacl_debug;
-    params.enable_mojo = base::CommandLine::ForCurrentProcess()->HasSwitch(
-        switches::kEnableNaClMojo);
 
     const ChildProcessData& data = process_->GetData();
     if (!ShareHandleToSelLdr(data.handle,
diff --git a/components/nacl/common/nacl_messages.h b/components/nacl/common/nacl_messages.h
index 191d5b9..46cae3f 100644
--- a/components/nacl/common/nacl_messages.h
+++ b/components/nacl/common/nacl_messages.h
@@ -25,7 +25,6 @@ IPC_STRUCT_TRAITS_BEGIN(nacl::NaClStartParams)
   IPC_STRUCT_TRAITS_MEMBER(version)
   IPC_STRUCT_TRAITS_MEMBER(enable_debug_stub)
   IPC_STRUCT_TRAITS_MEMBER(enable_ipc_proxy)
-  IPC_STRUCT_TRAITS_MEMBER(enable_mojo)
   IPC_STRUCT_TRAITS_MEMBER(process_type)
   IPC_STRUCT_TRAITS_MEMBER(crash_info_shmem_handle)
 IPC_STRUCT_TRAITS_END()
diff --git a/components/nacl/common/nacl_switches.cc b/components/nacl/common/nacl_switches.cc
index 4f158ad..6c5c81c 100644
--- a/components/nacl/common/nacl_switches.cc
+++ b/components/nacl/common/nacl_switches.cc
@@ -12,9 +12,6 @@ const char kDisablePnaclCrashThrottling[]   = "disable-pnacl-crash-throttling";
 // Enables debugging via RSP over a socket.
 const char kEnableNaClDebug[]               = "enable-nacl-debug";
 
-// Enables Mojo support for Native Client plugins.
-const char kEnableNaClMojo[]                = "enable-nacl-mojo";
-
 // Enables Non-SFI mode, in which programs can be run without NaCl's SFI
 // sandbox.
 const char kEnableNaClNonSfiMode[]          = "enable-nacl-nonsfi-mode";
diff --git a/components/nacl/common/nacl_switches.h b/components/nacl/common/nacl_switches.h
index ebaaa86..f6a4b4f 100644
--- a/components/nacl/common/nacl_switches.h
+++ b/components/nacl/common/nacl_switches.h
@@ -13,7 +13,6 @@ namespace switches {
 // alongside the definition of their values in the .cc file.
 extern const char kDisablePnaclCrashThrottling[];
 extern const char kEnableNaClDebug[];
-extern const char kEnableNaClMojo[];
 extern const char kEnableNaClNonSfiMode[];
 extern const char kEnablePNaClSubzero[];
 extern const char kNaClBrokerProcess[];
diff --git a/components/nacl/common/nacl_types.cc b/components/nacl/common/nacl_types.cc
index 4abb828..f7e628b 100644
--- a/components/nacl/common/nacl_types.cc
+++ b/components/nacl/common/nacl_types.cc
@@ -12,7 +12,6 @@ NaClStartParams::NaClStartParams()
       validation_cache_enabled(false),
       enable_debug_stub(false),
       enable_ipc_proxy(false),
-      enable_mojo(false),
       process_type(kUnknownNaClProcessType),
       crash_info_shmem_handle(base::SharedMemory::NULLHandle()) {
 }
diff --git a/components/nacl/common/nacl_types.h b/components/nacl/common/nacl_types.h
index f691edf..e5b7136 100644
--- a/components/nacl/common/nacl_types.h
+++ b/components/nacl/common/nacl_types.h
@@ -95,9 +95,6 @@ struct NaClStartParams {
   bool enable_debug_stub;
   bool enable_ipc_proxy;
 
-  // Enables plugin code to use Mojo APIs. See mojo/nacl for details.
-  bool enable_mojo;
-
   NaClAppProcessType process_type;
 
   // For NaCl <-> renderer crash information reporting.
diff --git a/components/nacl/loader/DEPS b/components/nacl/loader/DEPS
index 9cb889f..1b8ec2f 100644
--- a/components/nacl/loader/DEPS
+++ b/components/nacl/loader/DEPS
@@ -29,7 +29,5 @@ include_rules = [
   # For sending PpapiHostMsg_ChannelCreated in nacl_ipc_adapter.cc:
   "+ppapi/proxy/ppapi_messages.h",
 
-  # For supporting Mojo in plugins.
-  "+mojo/nacl",
   "+third_party/mojo/src/mojo/edk",
 ]
diff --git a/components/nacl/loader/nacl_helper_linux.cc b/components/nacl/loader/nacl_helper_linux.cc
index 6670eb2..e7e75fb 100644
--- a/components/nacl/loader/nacl_helper_linux.cc
+++ b/components/nacl/loader/nacl_helper_linux.cc
@@ -43,11 +43,6 @@
 #include "ipc/ipc_switches.h"
 #include "sandbox/linux/services/libc_urandom_override.h"
 
-#if !defined(OS_NACL_NONSFI)
-#include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
-#include "third_party/mojo/src/mojo/edk/embedder/simple_platform_support.h"
-#endif
-
 #if defined(OS_NACL_NONSFI)
 #include "native_client/src/public/nonsfi/irt_exception_handling.h"
 #else
@@ -464,12 +459,6 @@ int main(int argc, char* argv[]) {
   CheckRDebug(argv[0]);
 #endif
 
-// TODO(teravest): Enable mojo for nonsfi. http://crbug.com/473418
-#if !defined(OS_NACL_NONSFI)
-  mojo::embedder::Init(
-      make_scoped_ptr(new mojo::embedder::SimplePlatformSupport()));
-#endif
-
   scoped_ptr<nacl::NaClSandbox> nacl_sandbox(new nacl::NaClSandbox);
   // Make sure that the early initialization did not start any spurious
   // threads.
diff --git a/components/nacl/loader/nacl_helper_win_64.cc b/components/nacl/loader/nacl_helper_win_64.cc
index 7dfc376..d67b7b3 100644
--- a/components/nacl/loader/nacl_helper_win_64.cc
+++ b/components/nacl/loader/nacl_helper_win_64.cc
@@ -20,8 +20,6 @@
 #include "content/public/common/main_function_params.h"
 #include "content/public/common/sandbox_init.h"
 #include "sandbox/win/src/sandbox_types.h"
-#include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
-#include "third_party/mojo/src/mojo/edk/embedder/simple_platform_support.h"
 
 extern int NaClMain(const content::MainFunctionParams&);
 
@@ -64,8 +62,6 @@ int NaClWin64Main() {
   // Route stdio to parent console (if any) or create one.
   if (command_line.HasSwitch(switches::kEnableLogging))
     base::RouteStdioToConsole();
-  mojo::embedder::Init(
-      make_scoped_ptr(new mojo::embedder::SimplePlatformSupport()));
 
   // Initialize the sandbox for this process.
   bool sandbox_initialized_ok = content::InitializeSandbox(&sandbox_info);
diff --git a/components/nacl/loader/nacl_listener.cc b/components/nacl/loader/nacl_listener.cc
index 4cf4a3e..901c0c9 100644
--- a/components/nacl/loader/nacl_listener.cc
+++ b/components/nacl/loader/nacl_listener.cc
@@ -28,13 +28,9 @@
 #include "ipc/ipc_switches.h"
 #include "ipc/ipc_sync_channel.h"
 #include "ipc/ipc_sync_message_filter.h"
-#include "mojo/nacl/mojo_syscall.h"
 #include "native_client/src/public/chrome_main.h"
 #include "native_client/src/public/nacl_app.h"
 #include "native_client/src/public/nacl_desc.h"
-#include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
-#include "third_party/mojo/src/mojo/edk/embedder/platform_support.h"
-#include "third_party/mojo/src/mojo/edk/embedder/simple_platform_support.h"
 
 #if defined(OS_POSIX)
 #include "base/file_descriptor_posix.h"
@@ -437,16 +433,6 @@ void NaClListener::OnStart(const nacl::NaClStartParams& params) {
   args->nexe_desc = NaClDescCreateWithFilePathMetadata(nexe_file,
                                                        file_path_str.c_str());
 
-  if (params.enable_mojo) {
-    // 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);
-  }
   // TODO(yusukes): Support pre-opening resource files.
   CHECK(params.prefetched_resource_files.empty());