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

components/nacl.gyp

 # Copyright 2013 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     'nacl/nacl_defines.gypi',
@@ skipping 163 matching lines @@
               ],
               'dependencies': [
                 'nacl',
                 'nacl_common',
                 '../crypto/crypto.gyp:crypto',
                 '../sandbox/sandbox.gyp:libc_urandom_override',
                 '../sandbox/sandbox.gyp:sandbox',
               ],
               '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',
                 'nacl/loader/nacl_helper_linux.cc',
                 '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': [
                 ['toolkit_uses_gtk == 1', {
                   'dependencies': [
                     '../build/linux/system.gyp:gtk',
                   ],
                 }],
                 ['use_glib == 1', {
                   'dependencies': [
@@ skipping 155 matching lines @@
         'nacl/common/nacl_types.h',
         'nacl/common/pnacl_types.cc',
         'nacl/common/pnacl_types.h',
       ],
       'include_dirs': [
         '..',
       ],
     },
   ]
 }