Refactored Non-SFI and SFI NaCl into separate directories.

mojo/nacl/sfi/nacl_bindings/mojo_syscall.cc

 // Copyright 2014 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.
 
 // WARNING this file was generated by generate_nacl_bindings.py
 // Do not edit by hand.
 
-#include "nacl_bindings/mojo_syscall.h"
+#include "mojo/nacl/sfi/nacl_bindings/mojo_syscall.h"
 
 #include <stdio.h>
 
+#include "mojo/nacl/sfi/nacl_bindings/mojo_syscall_internal.h"
 #include "mojo/public/c/system/core.h"
 #include "mojo/public/platform/native/system_impl_private.h"
-#include "nacl_bindings/mojo_syscall_internal.h"
 #include "native_client/src/public/chrome_main.h"
 #include "native_client/src/public/nacl_app.h"
 #include "native_client/src/trusted/desc/nacl_desc_custom.h"
 
 MojoHandle g_mojo_handle = MOJO_HANDLE_INVALID;
 MojoSystemImpl g_mojo_system = nullptr;
 
 namespace {
 
 MojoResult _MojoGetInitialHandle(MojoHandle* handle) {
@@ skipping 696 matching lines @@
 MojoResult InjectMojo(struct NaClApp* nap, MojoHandle handle) {
   NaClAppSetDesc(nap, NACL_MOJO_DESC, MakeMojoDesc(nap));
   g_mojo_system = MojoSystemImplCreateImpl();
   return MojoSystemImplTransferHandle(MojoSystemImplGetDefaultImpl(), handle,
                                       g_mojo_system, &g_mojo_handle);
 }
 
 void InjectDisabledMojo(struct NaClApp* nap) {
   NaClAppSetDesc(nap, NACL_MOJO_DESC, MakeDisabledMojoDesc(nap));
 }