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

ppapi/ppapi_c.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_c',
+      'type': 'none',
+      'all_dependent_settings': {
+        'include_dirs+': [
+          '..',
+        ],
+      },
+      'sources': [
+        'c/pp_bool.h',
+        'c/pp_completion_callback.h',
+        'c/pp_errors.h',
+        'c/pp_file_info.h',
+        'c/pp_graphics_3d.h',
+        'c/pp_input_event.h',
+        'c/pp_instance.h',
+        'c/pp_macros.h',
+        'c/pp_module.h',
+        'c/pp_point.h',
+        'c/pp_rect.h',
+        'c/pp_resource.h',
+        'c/pp_size.h',
+        'c/pp_stdint.h',
+        'c/pp_time.h',
+        'c/pp_var.h',
+        'c/ppb.h',
+        'c/ppb_audio.h',
+        'c/ppb_audio_config.h',
+        'c/ppb_core.h',
+        'c/ppb_file_io.h',
+        'c/ppb_file_ref.h',
+        'c/ppb_file_system.h',
+        'c/ppb_fullscreen.h',
+        'c/ppb_graphics_2d.h',
+        'c/ppb_graphics_3d.h',
+        'c/ppb_image_data.h',
+        'c/ppb_input_event.h',
+        'c/ppb_instance.h',
+        'c/ppb_messaging.h',
+        'c/ppb_mouse_lock.h',
+        'c/ppb_opengles2.h',
+        'c/ppb_url_loader.h',
+        'c/ppb_url_request_info.h',
+        'c/ppb_url_response_info.h',
+        'c/ppb_var.h',
+        'c/ppp.h',
+        'c/ppp_graphics_3d.h',
+        'c/ppp_input_event.h',
+        'c/ppp_instance.h',
+        'c/ppp_messaging.h',
+        'c/ppp_mouse_lock.h',
+
+        # Dev interfaces.
+        'c/dev/pp_cursor_type_dev.h',
+        'c/dev/pp_video_dev.h',
+        'c/dev/ppb_buffer_dev.h',
+        'c/dev/ppb_char_set_dev.h',
+        'c/dev/ppb_context_3d_dev.h',
+        'c/dev/ppb_context_3d_trusted_dev.h',
+        'c/dev/ppb_console_dev.h',
+        'c/dev/ppb_cursor_control_dev.h',
+        'c/dev/ppb_directory_reader_dev.h',
+        'c/dev/ppb_file_chooser_dev.h',
+        'c/dev/ppb_find_dev.h',
+        'c/dev/ppb_font_dev.h',
+        'c/dev/ppb_fullscreen_dev.h',
+        'c/dev/ppb_ime_input_event_dev.h',
+        'c/dev/ppb_memory_dev.h',
+        'c/dev/ppb_scrollbar_dev.h',
+        'c/dev/ppb_surface_3d_dev.h',
+        'c/dev/ppb_testing_dev.h',
+        'c/dev/ppb_url_util_dev.h',
+        'c/dev/ppb_video_decoder_dev.h',
+        'c/dev/ppb_websocket_dev.h',
+        'c/dev/ppb_widget_dev.h',
+        'c/dev/ppb_zoom_dev.h',
+        'c/dev/ppp_cursor_control_dev.h',
+        'c/dev/ppp_find_dev.h',
+        'c/dev/ppp_network_state_dev.h',
+        'c/dev/ppp_scrollbar_dev.h',
+        'c/dev/ppp_selection_dev.h',
+        'c/dev/ppb_text_input_dev.h',
+        'c/dev/ppp_video_decoder_dev.h',
+        'c/dev/ppp_widget_dev.h',
+        'c/dev/ppp_zoom_dev.h',
+
+        # Private interfaces.
+        'c/private/ppb_flash.h',
+        'c/private/ppb_flash_clipboard.h',
+        'c/private/ppb_flash_file.h',
+        'c/private/ppb_flash_fullscreen.h',
+        'c/private/ppb_flash_menu.h',
+        'c/private/ppb_flash_net_connector.h',
+        'c/private/ppb_flash_tcp_socket.h',
+        'c/private/ppb_flash_udp_socket.h',
+        'c/private/ppb_gpu_blacklist_private.h',
+        'c/private/ppb_instance_private.h',
+        'c/private/ppb_nacl_private.h',
+        'c/private/ppb_net_address_private.h',
+        'c/private/ppb_pdf.h',
+        'c/private/ppb_proxy_private.h',
+        'c/private/ppp_instance_private.h',
+        'c/private/ppb_tcp_socket_private.h',
+        'c/private/ppb_udp_socket_private.h',
+
+        # Deprecated interfaces.
+        'c/dev/deprecated_bool.h',
+        'c/dev/ppb_var_deprecated.h',
+        'c/dev/ppp_class_deprecated.h',
+
+        # Trusted interfaces.
+        'c/trusted/ppb_audio_trusted.h',
+        'c/trusted/ppb_broker_trusted.h',
+        'c/trusted/ppb_buffer_trusted.h',
+        'c/trusted/ppb_file_chooser_trusted.h',
+        'c/trusted/ppb_file_io_trusted.h',
+        'c/trusted/ppb_graphics_3d_trusted.h',
+        'c/trusted/ppb_image_data_trusted.h',
+        'c/trusted/ppb_url_loader_trusted.h',
+        'c/trusted/ppp_broker.h',
+      ],
+      'conditions': [
+        ['p2p_apis==1', {
+          'sources': [
+            'c/dev/ppb_transport_dev.h',
+          ],
+        }],
+      ],
+    },
+  ],
+}