Refactor use of ppapi_cpp and ppapi_tests to avoid include of untrusted.gypi

gpu/demos/demos.gyp

 # 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.
 
 {
   'includes': [
     '../../ppapi/ppapi.gypi',
   ],
   'variables': {
     'chromium_code': 1,
@@ skipping 47 matching lines @@
           'dependencies': ['../../build/linux/system.gyp:gtk'],
         }],
       ],
     },
     {
       'target_name': 'gpu_demo_framework_ppapi',
       'suppress_wildcard': 1,  # So that 'all' doesn't end up being a bundle.
       'type': 'static_library',
       'dependencies': [
         'gpu_demo_framework',
-        '../../ppapi/ppapi.gyp:ppapi_cpp_objects',
+        '../../ppapi/ppapi_cpp.gyp:ppapi_cpp_objects',
         '../../ppapi/ppapi.gyp:ppapi_gles2',
       ],
       'include_dirs': [
         '../..',
         '../../ppapi/lib/gl/include',
         '../../third_party/gles2_book/Common/Include',
       ],
       'sources': [
         'framework/pepper.cc',
         '../../third_party/gles2_book/Common/Include/esUtil.h',
@@ skipping 218 matching lines @@
             'gles2_book/example.h',
             'gles2_book/demo_texture_wrap.cc',
             '../../third_party/gles2_book/Chapter_9/TextureWrap/TextureWrap.c',
             '../../third_party/gles2_book/Chapter_9/TextureWrap/TextureWrap.h',
           ],
         },
       ],
     }],
   ],
 }