Modifying ppapi_untrusted to match new gyp expectations.

default_defines is no longer set in untrusted.gypi
Using normal define merging instead.

R=bbudge@chromium.org
BUG=None
TEST=None


Review URL: https://chromiumcodereview.appspot.com/10825145

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149758 0039d316-1c4b-4281-b951-d872f2087c98

ppapi/ppapi_untrusted.gyp

@@ -36,12 +36,16 @@
          'ppapi_cpp_lib',
          'native_client/native_client.gyp:ppapi_lib',
          'native_client/native_client.gyp:nacl_irt',
-       ],
+      ],
       'variables': {
-         'defines': [
-            '<@(default_defines)',
-            '-DGL_GLEXT_PROTOTYPES',
-           ],
+        # TODO(bradnelson): Remove this compile flag once new nacl_rev is
+        # above 9362.
+        'compile_flags': [
+          '-DGL_GLEXT_PROTOTYPES',
+        ],
+        'defines': [
+          'GL_GLEXT_PROTOTYPES',
+        ],
         'nexe_target': 'ppapi_nacl_tests',
         'build_newlib': 1,
         'include_dirs': [