Adding nonsfi content handler

mojo/nacl/BUILD.gn

 # Copyright 2015 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.
 
 # Trusted code
 if (!is_nacl) {
   # A simple shell for running untrusted binaries that talk to the Mojo
   # embedder. (No services.)
   executable("monacl_shell") {
     testonly = true
     sources = [
       "monacl_shell.cc",
     ]
     deps = [
       "//base:base",
       "//mojo/edk/system:system",
       "//nacl_bindings:monacl_sel",
     ]
 
     data_deps = [ "//nacl_bindings:irt_mojo(//native_client/build/toolchain/nacl:irt_${target_cpu})" ]
   }
 
   executable("monacl_shell_nonsfi") {
     testonly = true
     sources = [
       "monacl_shell_nonsfi.cc",
     ]
     deps = [
+      ":irt_mojo_nonsfi",
       "//mojo/edk/system",
-      "//mojo/public/c/system",
-      "//mojo/public/platform/nacl:mojo_irt_header",
-      "//native_client/src/nonsfi/irt:irt_interfaces",
       "//native_client/src/nonsfi/loader:elf_loader",
     ]
   }
 }
 
 # Untrusted code
 if (is_nacl) {
   # Unit test for the Mojo public API.
   executable("monacl_test") {
     testonly = true
@@ skipping 24 matching lines @@
       #"//services/http_server",
       "//services/http_server:apptests",
       "//services/view_manager:mojo_view_manager_client_apptests",
       "//services/view_manager:view_manager_service_apptests",
       "//services/window_manager:window_manager_apptests",
       "//shell:apptests",
     ]
   }
 }
 
+source_set("irt_mojo_nonsfi") {

[Mark Seaborn, 2015/09/02 20:27:15]

Nit: Doesn't source_set mean this would get compiled twice, for each target that
uses it?  If so, making this a library would be better.

[Sean Klein, 2015/09/02 22:36:19]

Switched to static_library.

+  sources = [
+    "irt_mojo_nonsfi.cc",
+    "irt_mojo_nonsfi.h",
+  ]
+
+  deps = [
+    "//mojo/public/c/system",
+    "//mojo/public/platform/nacl:mojo_irt_header",
+    "//native_client/src/nonsfi/irt:irt_interfaces",
+  ]
+}
+
 group("mojo_nacl") {
   deps = [
     "//services/nacl:nacl_content_handler",
+    "//services/nacl:nacl_content_handler_nonsfi",
   ]
 }
 
 group("mojo_pnacl_tests") {
   testonly = true
   deps = [
     ":monacl_test(//native_client/build/toolchain/nacl:newlib_pnacl)",
   ]
 }
 
 group("mojo_nacl_tests") {
   testonly = true
   deps = [
     ":mojo_nacl_tests_untrusted(//native_client/build/toolchain/nacl:clang_newlib_${current_cpu})",
     ":monacl_shell",
     ":mojo_pnacl_tests",
   ]
 }