Move chrome/nacl to components/nacl.

components/nacl.gypi

Index: components/nacl.gypi
diff --git a/chrome/nacl.gypi b/components/nacl.gypi
similarity index 81%
rename from chrome/nacl.gypi
rename to components/nacl.gypi
index 158f8c091dd2f69aa0540e266c2b46f09fc2372b..1bb41625fbb1cb44f38147d755b3c899fd9c1312 100644
--- a/chrome/nacl.gypi
+++ b/components/nacl.gypi
@@ -24,18 +24,19 @@
           # .cc, .h, and .mm files under nacl that are used on all
           # platforms, including both 32-bit and 64-bit Windows.
           # Test files are also not included.
-          'nacl/nacl_ipc_adapter.cc',
-          'nacl/nacl_ipc_adapter.h',
-          'nacl/nacl_main.cc',
-          'nacl/nacl_main_platform_delegate.h',
-          'nacl/nacl_main_platform_delegate_linux.cc',
-          'nacl/nacl_main_platform_delegate_mac.mm',
-          'nacl/nacl_main_platform_delegate_win.cc',
-          'nacl/nacl_listener.cc',
-          'nacl/nacl_listener.h',
-          'nacl/nacl_validation_db.h',
-          'nacl/nacl_validation_query.cc',
-          'nacl/nacl_validation_query.h',
+          'nacl/common/nacl_sandbox_type_mac.h',
+          'nacl/loader/nacl_ipc_adapter.cc',
+          'nacl/loader/nacl_ipc_adapter.h',
+          'nacl/loader/nacl_main.cc',
+          'nacl/loader/nacl_main_platform_delegate.h',
+          'nacl/loader/nacl_main_platform_delegate_linux.cc',
+          'nacl/loader/nacl_main_platform_delegate_mac.mm',
+          'nacl/loader/nacl_main_platform_delegate_win.cc',
+          'nacl/loader/nacl_listener.cc',
+          'nacl/loader/nacl_listener.h',
+          'nacl/loader/nacl_validation_db.h',
+          'nacl/loader/nacl_validation_query.cc',
+          'nacl/loader/nacl_validation_query.h',
         ],
         # TODO(gregoryd): consider switching NaCl to use Chrome OS defines
         'conditions': [
@@ -52,8 +53,10 @@
               '__STDC_LIMIT_MACROS=1',
             ],
             'sources': [
-              'app/nacl_fork_delegate_linux.cc',
-              'app/nacl_fork_delegate_linux.h',
+              'nacl/common/nacl_fork_delegate_linux.h',
+              'nacl/common/nacl_paths.cc',
+              'nacl/common/nacl_paths.h',
+              'nacl/loader/nacl_fork_delegate_linux.cc',
             ],
           },],
         ],
@@ -111,12 +114,12 @@
                 '../ppapi/ppapi_internal.gyp:ppapi_ipc_win64',
               ],
               'sources': [
-                'common/nacl_cmd_line.cc',
-                'common/nacl_debug_exception_handler_win.cc',
-                'common/nacl_messages.cc',
-                'common/nacl_types.cc',
-                'nacl/nacl_broker_listener.cc',
-                'nacl/nacl_broker_listener.h',
+                'nacl/broker/nacl_broker_listener.cc',
+                'nacl/broker/nacl_broker_listener.h',
+                'nacl/common/nacl_cmd_line.cc',
+                'nacl/common/nacl_debug_exception_handler_win.cc',
+                'nacl/common/nacl_messages.cc',
+                'nacl/common/nacl_types.cc',
               ],
               'include_dirs': [
                 '..',
@@ -147,17 +150,16 @@
                 '..',
               ],
               'dependencies': [
+                '../components/nacl_common.gypi:nacl_common',
                 '../crypto/crypto.gyp:crypto',
                 '../sandbox/sandbox.gyp:libc_urandom_override',
                 '../sandbox/sandbox.gyp:sandbox',
                 'nacl',
               ],
               'sources': [
-                'nacl/nacl_helper_linux.cc',
-                'nacl/nacl_sandbox_linux.cc',
+                'nacl/loader/nacl_helper_linux.cc',
+                'nacl/loader/nacl_sandbox_linux.cc',
                 '../base/posix/unix_domain_socket_linux.cc',
-                '../chrome/common/nacl_messages.cc',
-                '../chrome/common/nacl_types.cc',
                 '../content/common/child_process_sandbox_support_impl_shm_linux.cc',
                 '../content/common/sandbox_init_linux.cc',
                 '../content/common/sandbox_seccomp_bpf_linux.cc',