Refactored Non-SFI and SFI NaCl into separate directories.

services/nacl/BUILD.gn

Index: services/nacl/BUILD.gn
diff --git a/services/nacl/BUILD.gn b/services/nacl/BUILD.gn
index 21e9c66c65df1e0b3de40757e53a991410e4b1e8..e0e4d405c19655e5e204f90efd29ec60f862fd47 100644
--- a/services/nacl/BUILD.gn
+++ b/services/nacl/BUILD.gn
@@ -19,12 +19,11 @@ if (!is_nacl) {
       "//mojo/message_pump",
       "//mojo/public/platform/native:system_impl_private",
       "//mojo/services/network/public/interfaces",
-      "//nacl_bindings:monacl_sel",
+      "//mojo/nacl/sfi/nacl_bindings:monacl_sel",
       "//url",
     ]
 
-    data_deps =
-        [ "//nacl_bindings:irt_mojo(//build/toolchain/nacl:irt_${target_cpu})" ]
+    data_deps = [ "//mojo/nacl/sfi/nacl_bindings:irt_mojo(//build/toolchain/nacl:irt_${target_cpu})" ]
   }
 
   if (current_cpu == "x86" || current_cpu == "arm") {
@@ -41,7 +40,7 @@ if (!is_nacl) {
         "//mojo/application:content_handler",
         "//mojo/data_pipe_utils",
         "//mojo/message_pump",
-        "//mojo/nacl:irt_mojo_nonsfi",
+        "//mojo/nacl/nonsfi:irt_mojo_nonsfi",
         "//mojo/public/cpp/application:application",
         "//native_client/src/nonsfi/loader:elf_loader",
       ]