Reland: content_{renderer,tests}.gypi cleanup of plugin+webrtc sources

content/content_tests.gypi

 # Copyright (c) 2013 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.
 
 {
   'variables': {
     'layouttest_support_content_sources': [
       'public/test/layouttest_support.h',
       'public/test/nested_message_pump_android.cc',
       'public/test/nested_message_pump_android.h',
@@ skipping 684 matching lines @@
       'test/image_decoder_test.h',
       'test/run_all_unittests.cc',
     ],
     'content_unittests_speech_sources': [
       'browser/speech/chunked_byte_buffer_unittest.cc',
       'browser/speech/endpointer/endpointer_unittest.cc',
       'browser/speech/google_one_shot_remote_engine_unittest.cc',
       'browser/speech/google_streaming_remote_engine_unittest.cc',
       'browser/speech/speech_recognizer_impl_unittest.cc',
     ],
+    # Put WebRTC-related sources in the plugin+WebRTC section below.
     'content_unittests_plugins_sources': [
       'browser/plugin_loader_posix_unittest.cc',
       'browser/renderer_host/pepper/browser_ppapi_host_test.cc',
       'browser/renderer_host/pepper/browser_ppapi_host_test.h',
       'browser/renderer_host/pepper/pepper_file_system_browser_host_unittest.cc',
       'browser/renderer_host/pepper/pepper_gamepad_host_unittest.cc',
       'browser/renderer_host/pepper/pepper_printing_host_unittest.cc',
       'browser/renderer_host/pepper/quota_reservation_unittest.cc',
       'child/npapi/plugin_lib_unittest.cc',
-      'renderer/media/pepper_to_video_track_adapter_unittest.cc',
       'renderer/npapi/webplugin_impl_unittest.cc',
       'renderer/pepper/event_conversion_unittest.cc',
       'renderer/pepper/host_var_tracker_unittest.cc',
       'renderer/pepper/mock_resource.h',
       'renderer/pepper/pepper_broker_unittest.cc',
       'renderer/pepper/plugin_instance_throttler_impl_unittest.cc',
       'renderer/pepper/v8_var_converter_unittest.cc',
     ],
+    # WebRTC-specific sources. Put WebRTC plugin-related stuff further below.
     'content_unittests_webrtc_sources': [
       'browser/media/webrtc_internals_unittest.cc',
       'browser/renderer_host/media/webrtc_identity_service_host_unittest.cc',
       'browser/renderer_host/p2p/socket_host_tcp_server_unittest.cc',
       'browser/renderer_host/p2p/socket_host_tcp_unittest.cc',
       'browser/renderer_host/p2p/socket_host_test_utils.cc',
       'browser/renderer_host/p2p/socket_host_test_utils.h',
       'browser/renderer_host/p2p/socket_host_udp_unittest.cc',
       'browser/renderer_host/p2p/socket_host_unittest.cc',
       'renderer/media/media_recorder_handler_unittest.cc',
@@ skipping 10 matching lines @@
       'renderer/media/mock_media_stream_video_sink.cc',
       'renderer/media/mock_media_stream_video_sink.h',
       'renderer/media/mock_media_stream_video_source.cc',
       'renderer/media/mock_media_stream_video_source.h',
       'renderer/media/rtc_data_channel_handler_unittest.cc',
       'renderer/media/rtc_peer_connection_handler_unittest.cc',
       'renderer/media/rtc_video_decoder_unittest.cc',
       'renderer/media/speech_recognition_audio_sink_unittest.cc',
       'renderer/media/user_media_client_impl_unittest.cc',
       'renderer/media/video_track_recorder_unittest.cc',
-      'renderer/media/video_track_to_pepper_adapter_unittest.cc',
       'renderer/media/webrtc/media_stream_remote_video_source_unittest.cc',
       'renderer/media/webrtc/media_stream_track_metrics_unittest.cc',
       'renderer/media/webrtc/peer_connection_dependency_factory_unittest.cc',
       'renderer/media/webrtc/stun_field_trial_unittest.cc',
       'renderer/media/webrtc/webrtc_local_audio_track_adapter_unittest.cc',
       'renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc',
       'renderer/media/webrtc/webrtc_video_capturer_adapter_unittest.cc',
       'renderer/media/webrtc_audio_capturer_unittest.cc',
       'renderer/media/webrtc_audio_renderer_unittest.cc',
       'renderer/media/webrtc_identity_service_unittest.cc',
       'renderer/media/webrtc_local_audio_source_provider_unittest.cc',
       'renderer/media/webrtc_local_audio_track_unittest.cc',
       'renderer/media/webrtc_uma_histograms_unittest.cc',
       'renderer/p2p/ipc_network_manager_unittest.cc',
     ],
+    'content_unittests_plugin_webrtc_sources': [
+      'renderer/media/pepper_to_video_track_adapter_unittest.cc',
+      'renderer/media/video_track_to_pepper_adapter_unittest.cc',
+    ],
     'content_unittests_android_sources': [
       'browser/android/java/gin_java_method_invocation_helper_unittest.cc',
       'browser/android/java/java_type_unittest.cc',
       'browser/android/java/jni_helper_unittest.cc',
       'browser/android/overscroll_refresh_unittest.cc',
       'browser/android/url_request_content_job_unittest.cc',
       'browser/renderer_host/input/motion_event_android_unittest.cc',
       'renderer/java/gin_java_bridge_value_converter_unittest.cc',
     ],
   },
@@ skipping 310 matching lines @@
         ['enable_plugins==1', {
           'sources': [ '<@(content_unittests_plugins_sources)' ],
         }],
         ['enable_webrtc==1', {
           'sources': [ '<@(content_unittests_webrtc_sources)' ],
           'dependencies': [
             '../third_party/libjingle/libjingle.gyp:libjingle_webrtc',
             '../third_party/libjingle/libjingle.gyp:libpeerconnection',
             '../third_party/webrtc/modules/modules.gyp:video_capture_module',
           ]
-        }, {
-          'sources!': [
-            'renderer/media/pepper_to_video_track_adapter_unittest.cc',
-          ],
+        }],
+        ['enable_webrtc==1 and enable_plugins==1', {
+          'sources': [ '<@(content_unittests_plugin_webrtc_sources)' ],
         }],
         ['enable_webrtc==1 and (OS=="linux" or OS=="mac" or OS=="win")', {
           'sources': [
             'browser/media/capture/desktop_capture_device_unittest.cc',
           ],
           'dependencies': [
             '../third_party/webrtc/modules/modules.gyp:desktop_capture',
           ],
         }],
         ['enable_webrtc==1 and chromeos==1', {
@@ skipping 1024 matching lines @@
             ],
           },
           'includes': [
             '../build/host_jar.gypi',
           ],
         },
       ],
     }],
   ],
 }