Adding nonsfi content handler

mojo/nacl/monacl_shell_nonsfi.cc

Index: mojo/nacl/monacl_shell_nonsfi.cc
diff --git a/mojo/nacl/monacl_shell_nonsfi.cc b/mojo/nacl/monacl_shell_nonsfi.cc
index 3bacf9642812107f66112334aa507b69553ae4e2..a8496ee84a5e9635a100ce8b7e265d107b6199bb 100644
--- a/mojo/nacl/monacl_shell_nonsfi.cc
+++ b/mojo/nacl/monacl_shell_nonsfi.cc
@@ -7,52 +7,10 @@
 
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/simple_platform_support.h"
-#include "mojo/public/platform/nacl/mojo_irt.h"
+#include "mojo/nacl/irt_mojo_nonsfi.h"
 #include "native_client/src/public/irt_core.h"
 #include "native_client/src/public/nonsfi/elf_loader.h"
 
-namespace {
-
-const struct nacl_irt_mojo kIrtMojo = {
-  MojoCreateSharedBuffer,
-  MojoDuplicateBufferHandle,
-  MojoMapBuffer,
-  MojoUnmapBuffer,
-  MojoCreateDataPipe,
-  MojoWriteData,
-  MojoBeginWriteData,
-  MojoEndWriteData,
-  MojoReadData,
-  MojoBeginReadData,
-  MojoEndReadData,
-  MojoGetTimeTicksNow,
-  MojoClose,
-  MojoWait,
-  MojoWaitMany,
-  MojoCreateMessagePipe,
-  MojoWriteMessage,
-  MojoReadMessage,
-  nullptr, // TODO(smklein): Add _MojoGetInitialHandle.
-};
-
-const struct nacl_irt_interface kIrtInterfaces[] = {
-  { NACL_IRT_MOJO_v0_1, &kIrtMojo, sizeof(kIrtMojo), nullptr }
-};
-
-size_t mojo_irt_nonsfi_query(const char* interface_ident,
-                             void* table, size_t tablesize) {
-  size_t result = nacl_irt_query_list(interface_ident,
-                                      table,
-                                      tablesize,
-                                      kIrtInterfaces,
-                                      sizeof(kIrtInterfaces));
-  if (result != 0)
-    return result;
-  return nacl_irt_query_core(interface_ident, table, tablesize);
-}
-
-} // namespace
-
 int main(int argc, char** argv, char** environ) {
   nacl_irt_nonsfi_allow_dev_interfaces();
   if (argc < 2) {
@@ -73,5 +31,5 @@ int main(int argc, char** argv, char** environ) {
 
   return nacl_irt_nonsfi_entry(argc - 1, argv + 1, environ,
                                reinterpret_cast<nacl_entry_func_t>(entry),
-                               mojo_irt_nonsfi_query);
+                               irtNonsfi::MojoIrtNonsfiQuery);
 }