Fix crashes when loading gles2.cc on browser startup, and during playback.

ppapi/ppapi_tests.gypi

 # Copyright (c) 2011 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.
 
 {
   'targets': [
      {
       'target_name': 'ppapi_example',
       'dependencies': [
         'ppapi.gyp:ppapi_cpp'
@@ skipping 179 matching lines @@
     },
   ],
 
   'conditions': [
     # NOTE: the PPAPI examples fail to build on mac & windows.
     # http://code.google.com/p/chromium/issues/detail?id=54005 tracks mac.
     # TODO(ppapi authors):  Make the examples build on Windows as well.
     ['OS!="win" and OS!="mac"', {
       'targets': [
         {
-          'target_name': 'ppapi_example_base_skeleton',
+          'target_name': 'ppapi_example_skeleton',
           'type': 'none',
           'direct_dependent_settings': {
             'product_name': '>(_target_name)',
             'conditions': [
               ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
                 'cflags': ['-fvisibility=hidden'],
-                'variables': { 'concrete_type': 'shared_library' },
+                'type': 'shared_library',
                 # -gstabs, used in the official builds, causes an ICE. Simply remove
                 # it.
                 'cflags!': ['-gstabs'],
               }],
               ['OS=="win"', {
-                'variables': { 'concrete_type': 'shared_library' },
+                'type': 'shared_library',
               }],
               ['OS=="mac"', {
-                'variables': { 'concrete_type': 'loadable_module' },
+                'type': 'loadable_module',
               }],
             ],
           },
         },
         {
-          'target_name': 'ppapi_example_cpp_skeleton',
-          'type': 'none',
-          'direct_dependent_settings': {
-            'type': '>(concrete_type)',
-          },
-          'dependencies': [
-            'ppapi_example_base_skeleton',
-            'ppapi.gyp:ppapi_cpp',
-          ],
-          'export_dependent_settings': [
-            'ppapi_example_base_skeleton',
-            'ppapi.gyp:ppapi_cpp',
-          ],
-        },
-        {
-          'target_name': 'ppapi_example_c_skeleton',
-          'type': 'none',
-          'direct_dependent_settings': {
-            'type': '>(concrete_type)',
-          },
-          'dependencies': [
-            'ppapi_example_base_skeleton',
-            'ppapi.gyp:ppapi_c',
-          ],
-          'export_dependent_settings': [
-            'ppapi_example_base_skeleton',
-            'ppapi.gyp:ppapi_c',
-          ],
-        },
-        {
           'target_name': 'ppapi_example_c_stub',
           'dependencies': [
-            'ppapi_example_c_skeleton',
+            'ppapi_example_skeleton',
+            'ppapi.gyp:ppapi_c',
           ],
           'sources': [
             'examples/stub/stub.c',
           ],
         },
         {
           'target_name': 'ppapi_example_cc_stub',
           'dependencies': [
-            'ppapi_example_cpp_skeleton',
+            'ppapi_example_skeleton',
+            'ppapi.gyp:ppapi_cpp',
           ],
           'sources': [
             'examples/stub/stub.cc',
           ],
         },
         {
           'target_name': 'ppapi_example_audio',
           'dependencies': [
-            'ppapi_example_cpp_skeleton',
+            'ppapi_example_skeleton',
+            'ppapi.gyp:ppapi_cpp',
           ],
           'sources': [
             'examples/audio/audio.cc',
           ],
         },
         {
           'target_name': 'ppapi_example_file_chooser',
           'dependencies': [
-            'ppapi_example_cpp_skeleton',
+            'ppapi_example_skeleton',
+            'ppapi.gyp:ppapi_cpp',
           ],
           'sources': [
             'examples/file_chooser/file_chooser.cc',
           ],
         },
         {
           'target_name': 'ppapi_example_graphics_2d',
           'dependencies': [
-            'ppapi_example_c_skeleton',
+            'ppapi_example_skeleton',
+            'ppapi.gyp:ppapi_c',
           ],
           'sources': [
             'examples/2d/graphics_2d_example.c',
           ],
         },
         {
           'target_name': 'ppapi_example_paint_manager',
           'dependencies': [
-            'ppapi_example_cpp_skeleton',
+            'ppapi_example_skeleton',
+            'ppapi.gyp:ppapi_cpp',
           ],
           'sources': [
             'examples/2d/paint_manager_example.cc',
           ],
         },
         {
           'target_name': 'ppapi_example_post_message',
           'dependencies': [
-            'ppapi_example_cpp_skeleton',
+            'ppapi_example_skeleton',
+            'ppapi.gyp:ppapi_cpp',
           ],
           'sources': [
             'examples/scripting/post_message.cc',
           ],
         },
         {
           'target_name': 'ppapi_example_scroll',
           'dependencies': [
-            'ppapi_example_cpp_skeleton',
+            'ppapi_example_skeleton',
+            'ppapi.gyp:ppapi_cpp',
           ],
           'sources': [
             'examples/2d/scroll.cc',
           ],
         },
         {
           'target_name': 'ppapi_example_simple_font',
           'dependencies': [
-            'ppapi_example_cpp_skeleton',
+            'ppapi_example_skeleton',
+            'ppapi.gyp:ppapi_cpp',
           ],
           'sources': [
             'examples/font/simple_font.cc',
           ],
         },
         {
           'target_name': 'ppapi_example_gles2',
           'dependencies': [
-            'ppapi_example_cpp_skeleton',
+            'ppapi_example_skeleton',
+            'ppapi.gyp:ppapi_cpp',
             'ppapi.gyp:ppapi_gles2',
             'lib/gl/gl.gyp:ppapi_egl',
           ],
           'include_dirs': [
             'lib/gl/include',
           ],
           'sources': [
             'examples/gles2/gles2.cc',
             'examples/gles2/testdata.h',
           ],
         },
       ],
     }]
   ]
 }