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

ppapi/ppapi_tests.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.
 
 {
   'targets': [
      {
       'target_name': 'ppapi_example',
       'dependencies': [
-        'ppapi.gyp:ppapi_cpp'
+        'ppapi_cpp.gyp:ppapi_cpp'
       ],
       'xcode_settings': {
         'INFOPLIST_FILE': 'example/Info.plist',
       },
       'sources': [
         'example/example.cc',
       ],
       'conditions': [
         ['OS=="win"', {
           'type': 'shared_library',
@@ skipping 115 matching lines @@
         'tests/test_video_decoder.cc',
         'tests/test_video_decoder.h',
 
         # Deprecated test cases.
         'tests/test_instance_deprecated.cc',
         'tests/test_instance_deprecated.h',
         'tests/test_var_deprecated.cc',
         'tests/test_var_deprecated.h',
       ],
       'dependencies': [
-        'ppapi.gyp:ppapi_cpp',
+        'ppapi_cpp.gyp:ppapi_cpp',
         'ppapi_internal.gyp:ppapi_shared',
       ],
       'run_as': {
         'action': [
           '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)chrome<(EXECUTABLE_SUFFIX)',
           '--enable-pepper-testing',
           '--enable-accelerated-plugins',
           '--register-pepper-plugins=$(TargetPath);application/x-ppapi-tests',
           'file://$(ProjectDir)/tests/test_case.html?testcase=',
         ],
@@ skipping 35 matching lines @@
 #        },
 #      ],
     },
     {
       'target_name': 'ppapi_unittests',
       'type': 'executable',
       'variables': {
         'chromium_code': 1,
       },
       'dependencies': [
-        'ppapi_proxy',
-        'ppapi_shared',
+        'ppapi_internal.gyp:ppapi_proxy',
+        'ppapi_internal.gyp:ppapi_shared',
         '../base/base.gyp:test_support_base',
         '../gpu/gpu.gyp:gpu_ipc',
         '../ipc/ipc.gyp:ipc',
         '../ipc/ipc.gyp:test_support_ipc',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../ui/gfx/surface/surface.gyp:surface',
       ],
       'sources': [
         'proxy/run_all_unittests.cc',
@@ skipping 44 matching lines @@
                 '-Wl,-exported_symbol,_PPP_ShutdownModule'
               ]},
           }],
         ],
       },
     },
     {
       'target_name': 'ppapi_example_mouse_lock',
       'dependencies': [
         'ppapi_example_skeleton',
-        'ppapi.gyp:ppapi_cpp',
+        'ppapi_cpp.gyp:ppapi_cpp',
       ],
       'sources': [
         'examples/mouse_lock/mouse_lock.cc',
       ],
     },
 
     {
       'target_name': 'ppapi_example_c_stub',
       'dependencies': [
         'ppapi_example_skeleton',
         'ppapi.gyp:ppapi_c',
       ],
       'sources': [
         'examples/stub/stub.c',
       ],
     },
     {
       'target_name': 'ppapi_example_cc_stub',
       'dependencies': [
         'ppapi_example_skeleton',
-        'ppapi.gyp:ppapi_cpp',
+        'ppapi_cpp.gyp:ppapi_cpp',
       ],
       'sources': [
         'examples/stub/stub.cc',
       ],
     },
     {
       'target_name': 'ppapi_example_audio',
       'dependencies': [
         'ppapi_example_skeleton',
-        'ppapi.gyp:ppapi_cpp',
+        'ppapi_cpp.gyp:ppapi_cpp',
       ],
       'sources': [
         'examples/audio/audio.cc',
       ],
     },
     {
       'target_name': 'ppapi_example_file_chooser',
       'dependencies': [
         'ppapi_example_skeleton',
-        'ppapi.gyp:ppapi_cpp',
+        'ppapi_cpp.gyp:ppapi_cpp',
       ],
       'sources': [
         'examples/file_chooser/file_chooser.cc',
       ],
     },
     {
       'target_name': 'ppapi_example_graphics_2d',
       'dependencies': [
         'ppapi_example_skeleton',
         'ppapi.gyp:ppapi_c',
       ],
       'sources': [
         'examples/2d/graphics_2d_example.c',
       ],
     },
     {
       'target_name': 'ppapi_example_ime',
       'dependencies': [
         'ppapi_example_skeleton',
-        'ppapi.gyp:ppapi_cpp',
+        'ppapi_cpp.gyp:ppapi_cpp',
       ],
       'sources': [
         'examples/ime/ime.cc',
       ],
     },
     {
       'target_name': 'ppapi_example_paint_manager',
       'dependencies': [
         'ppapi_example_skeleton',
-        'ppapi.gyp:ppapi_cpp',
+        'ppapi_cpp.gyp:ppapi_cpp',
       ],
       'sources': [
         'examples/2d/paint_manager_example.cc',
       ],
     },
     {
       'target_name': 'ppapi_example_post_message',
       'dependencies': [
         'ppapi_example_skeleton',
-        'ppapi.gyp:ppapi_cpp',
+        'ppapi_cpp.gyp:ppapi_cpp',
       ],
       'sources': [
         'examples/scripting/post_message.cc',
       ],
     },
     {
       'target_name': 'ppapi_example_scroll',
       'dependencies': [
         'ppapi_example_skeleton',
-        'ppapi.gyp:ppapi_cpp',
+        'ppapi_cpp.gyp:ppapi_cpp',
       ],
       'sources': [
         'examples/2d/scroll.cc',
       ],
     },
     {
       'target_name': 'ppapi_example_simple_font',
       'dependencies': [
         'ppapi_example_skeleton',
-        'ppapi.gyp:ppapi_cpp',
+        'ppapi_cpp.gyp:ppapi_cpp',
       ],
       'sources': [
         'examples/font/simple_font.cc',
       ],
     },
     {
       'target_name': 'ppapi_example_url_loader',
       'dependencies': [
         'ppapi_example_skeleton',
-        'ppapi.gyp:ppapi_cpp',
+        'ppapi_cpp.gyp:ppapi_cpp',
       ],
       'sources': [
         'examples/url_loader/streaming.cc',
       ],
     },
     {
       'target_name': 'ppapi_example_gles2',
       'dependencies': [
         'ppapi_example_skeleton',
-        'ppapi.gyp:ppapi_cpp',
+        'ppapi_cpp.gyp:ppapi_cpp',
         'ppapi.gyp:ppapi_gles2',
         'ppapi.gyp:ppapi_egl',
       ],
       'include_dirs': [
         'lib/gl/include',
       ],
       'sources': [
         'examples/gles2/gles2.cc',
         'examples/gles2/testdata.h',
       ],
     },
     {
       'target_name': 'ppapi_example_vc',
       'dependencies': [
         'ppapi_example_skeleton',
-        'ppapi.gyp:ppapi_cpp',
+        'ppapi_cpp.gyp:ppapi_cpp',
         'ppapi.gyp:ppapi_gles2',
         'ppapi.gyp:ppapi_egl',
       ],
       'include_dirs': [
         'lib/gl/include',
       ],
       'sources': [
         'examples/video_capture/video_capture.cc',
       ],
     },
   ],
 }