Remove "nacl_defines" from the GYP build.

components/nacl.gyp

Index: components/nacl.gyp
diff --git a/components/nacl.gyp b/components/nacl.gyp
index 8524e92ee9c1d9d084957abff74aaa7081813f02..b83c4b38a331d1f0542dcf6c9341ed4710a72bb2 100644
--- a/components/nacl.gyp
+++ b/components/nacl.gyp
@@ -6,9 +6,6 @@
   'variables': {
     'chromium_code': 1,
   },
-  'includes': [
-    'nacl/nacl_defines.gypi',
-  ],
   'target_defaults': {
     'variables': {
       'nacl_target': 0,
@@ -20,9 +17,6 @@
         'include_dirs': [
           '<(INTERMEDIATE_DIR)',
         ],
-        'defines': [
-          '<@(nacl_defines)',
-        ],
         'sources': [
           # .cc, .h, and .mm files under nacl that are used on all
           # platforms, including both 32-bit and 64-bit Windows.
@@ -93,11 +87,6 @@
               ],
             }],
           ],
-          'direct_dependent_settings': {
-            'defines': [
-              '<@(nacl_defines)',
-            ],
-          },
         },
         {
           'target_name': 'nacl_browser',
@@ -133,9 +122,6 @@
             '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel',
             '../content/content.gyp:content_browser',
           ],
-          'defines': [
-            '<@(nacl_defines)',
-          ],
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [4267, ],
           'conditions': [
@@ -191,14 +177,6 @@
             '../third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
             '../third_party/WebKit/public/blink.gyp:blink',
           ],
-          'defines': [
-            '<@(nacl_defines)',
-          ],
-          'direct_dependent_settings': {
-            'defines': [
-              '<@(nacl_defines)',
-            ],
-          },
         },
         {
           'target_name': 'nacl_loader_unittests',
@@ -267,7 +245,6 @@
                 '..',
               ],
               'defines': [
-                '<@(nacl_defines)',
                 # Allow .cc files to know if they're being compiled as part
                 # of nacl_helper.
                 'IN_NACL_HELPER=1',
@@ -385,11 +362,6 @@
                   'msvs_target_platform': 'x64',
                 },
               },
-              'direct_dependent_settings': {
-                'defines': [
-                  '<@(nacl_defines)',
-                ],
-              },
             },
             {
               'target_name': 'nacl_switches_win64',