Revert of Linux Sandbox: split the GPU policies to their own file.

components/nacl.gyp

Index: components/nacl.gyp
diff --git a/components/nacl.gyp b/components/nacl.gyp
index 3a86d2df4ddcdb730072aaaacadb68b9abe308cf..a964bc11ba76cf821c7726c190e44a6b2b767900 100644
--- a/components/nacl.gyp
+++ b/components/nacl.gyp
@@ -181,9 +181,6 @@
               ],
               'defines': [
                 '<@(nacl_defines)',
-                # Allow .cc files to know if they're being compiled as part
-                # of nacl_helper.
-                'IN_NACL_HELPER=1',
               ],
               'sources': [
                 'nacl/loader/nacl_sandbox_linux.cc',
@@ -191,9 +188,9 @@
                 'nacl/loader/nacl_helper_linux.h',
                 '../base/posix/unix_domain_socket_linux.cc',
                 '../content/common/child_process_sandbox_support_impl_shm_linux.cc',
-                '../content/common/sandbox_linux/sandbox_bpf_base_policy_linux.cc',
-                '../content/common/sandbox_linux/sandbox_init_linux.cc',
-                '../content/common/sandbox_linux/sandbox_seccomp_bpf_linux.cc',
+                '../content/common/sandbox_bpf_base_policy_linux.cc',
+                '../content/common/sandbox_init_linux.cc',
+                '../content/common/sandbox_seccomp_bpf_linux.cc',
                 '../content/public/common/content_switches.cc',
               ],
               'conditions': [