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

ppapi/native_client/src/trusted/plugin/plugin.gyp

 # -*- python -*-
 # Copyright (c) 2011 The Native Client 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': [
     'plugin.gypi',
   ],
   'target_defaults': {
@@ skipping 56 matching lines @@
             '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:nonnacl_srpc',
             '<(DEPTH)/native_client/src/third_party_mod/jsoncpp/jsoncpp.gyp:jsoncpp',
             '<(DEPTH)/native_client/src/trusted/desc/desc.gyp:nrd_xfer',
             '<(DEPTH)/native_client/src/trusted/nonnacl_util/nonnacl_util.gyp:nonnacl_util',
             '<(DEPTH)/native_client/src/trusted/platform_qualify/platform_qualify.gyp:platform_qual_lib',
             '<(DEPTH)/native_client/src/trusted/gio/gio_wrapped_desc.gyp:gio_wrapped_desc',
             '<(DEPTH)/native_client/src/trusted/simple_service/simple_service.gyp:simple_service',
             '<(DEPTH)/native_client/src/trusted/reverse_service/reverse_service.gyp:reverse_service',
             '<(DEPTH)/native_client/src/trusted/weak_ref/weak_ref.gyp:weak_ref',
             '<(DEPTH)/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp:nacl_ppapi_browser',
-            '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp',
+            '<(DEPTH)/ppapi/ppapi_cpp.gyp:ppapi_cpp',
           ],
       }],
     }],
     ['nacl_standalone==0', {
       'targets': [
         {
           'target_name': 'ppGoogleNaClPluginChrome',
           'type': 'loadable_module',
           'sources': [
             '<@(common_sources)',
@@ skipping 10 matching lines @@
             '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform',
             '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:nonnacl_srpc',
             '<(DEPTH)/native_client/src/trusted/desc/desc.gyp:nrd_xfer',
             '<(DEPTH)/native_client/src/trusted/nonnacl_util/nonnacl_util.gyp:nonnacl_util',
             '<(DEPTH)/native_client/src/trusted/platform_qualify/platform_qualify.gyp:platform_qual_lib',
             '<(DEPTH)/native_client/src/trusted/gio/gio_wrapped_desc.gyp:gio_wrapped_desc',
             '<(DEPTH)/native_client/src/trusted/simple_service/simple_service.gyp:simple_service',
             '<(DEPTH)/native_client/src/trusted/reverse_service/reverse_service.gyp:reverse_service',
             '<(DEPTH)/native_client/src/trusted/weak_ref/weak_ref.gyp:weak_ref',
             '<(DEPTH)/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp:nacl_ppapi_browser',
-            '<(DEPTH)/ppapi/ppapi.gyp:ppapi_cpp',
+            '<(DEPTH)/ppapi/ppapi_cpp.gyp:ppapi_cpp',
             '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
           ],
           'conditions': [
             ['OS=="mac"', {
               'mac_bundle': 1,
               'product_name': 'ppGoogleNaClPluginChrome',
               'product_extension': 'plugin',
             }],
             ['OS=="mac" and mac_breakpad==1', {
               'variables': {
                 # A real .dSYM is needed for dump_syms to operate on.
                 'mac_real_dsym': 1,
               },
             }],
             ['OS=="win"', {
               'dependencies': [
                 '<(DEPTH)/native_client/src/trusted/handle_pass/handle_pass.gyp:browserhandle',
                 '<(DEPTH)/native_client/src/trusted/handle_pass/handle_pass.gyp:handle_lookup',
                 '<(DEPTH)/native_client/src/trusted/handle_pass/handle_pass.gyp:ldrhandle',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }