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

content/content_renderer.gypi

 # Copyright (c) 2012 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.
 
 {
   'dependencies': [
     '../base/base.gyp:base',
     '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
     '../cc/cc.gyp:cc',
     '../cc/blink/cc_blink.gyp:cc_blink',
@@ skipping 635 matching lines @@
       'renderer/media/rtc_video_encoder.h',
       'renderer/media/rtc_video_encoder_factory.cc',
       'renderer/media/rtc_video_encoder_factory.h',
       'renderer/media/speech_recognition_audio_sink.cc',
       'renderer/media/speech_recognition_audio_sink.h',
       'renderer/media/user_media_client_impl.cc',
       'renderer/media/video_track_adapter.cc',
       'renderer/media/video_track_adapter.h',
       'renderer/media/video_track_recorder.cc',
       'renderer/media/video_track_recorder.h',
-      'renderer/media/video_track_to_pepper_adapter.cc',
-      'renderer/media/video_track_to_pepper_adapter.h',
       'renderer/media/webaudio_capturer_source.cc',
       'renderer/media/webaudio_capturer_source.h',
       'renderer/media/webrtc/media_stream_remote_video_source.cc',
       'renderer/media/webrtc/media_stream_remote_video_source.h',
       'renderer/media/webrtc/media_stream_track_metrics.cc',
       'renderer/media/webrtc/media_stream_track_metrics.h',
       'renderer/media/webrtc/peer_connection_dependency_factory.cc',
       'renderer/media/webrtc/peer_connection_dependency_factory.h',
       'renderer/media/webrtc/stun_field_trial.cc',
       'renderer/media/webrtc/stun_field_trial.h',
       'renderer/media/webrtc/track_observer.cc',
       'renderer/media/webrtc/track_observer.h',
-      'renderer/media/pepper_to_video_track_adapter.cc',
-      'renderer/media/pepper_to_video_track_adapter.h',
       'renderer/media/webrtc/webrtc_audio_sink_adapter.cc',
       'renderer/media/webrtc/webrtc_audio_sink_adapter.h',
       'renderer/media/webrtc/webrtc_local_audio_track_adapter.cc',
       'renderer/media/webrtc/webrtc_local_audio_track_adapter.h',
       'renderer/media/webrtc/webrtc_media_stream_adapter.cc',
       'renderer/media/webrtc/webrtc_media_stream_adapter.h',
       'renderer/media/webrtc/webrtc_video_capturer_adapter.cc',
       'renderer/media/webrtc/webrtc_video_capturer_adapter.h',
       'renderer/media/webrtc/webrtc_video_frame_adapter.cc',
       'renderer/media/webrtc/webrtc_video_frame_adapter.h',
@@ skipping 28 matching lines @@
       'renderer/p2p/network_list_observer.h',
       'renderer/p2p/port_allocator.cc',
       'renderer/p2p/port_allocator.h',
       'renderer/p2p/socket_client_impl.cc',
       'renderer/p2p/socket_client_impl.h',
       'renderer/p2p/socket_dispatcher.cc',
       'renderer/p2p/socket_dispatcher.h',
     ],
     # Stuff only used when both WebRTC and plugins are enabled.
     'private_renderer_plugin_webrtc_sources': [
+      'renderer/media/pepper_to_video_track_adapter.cc',
+      'renderer/media/pepper_to_video_track_adapter.h',
+      'renderer/media/video_track_to_pepper_adapter.cc',
+      'renderer/media/video_track_to_pepper_adapter.h',
       'renderer/pepper/pepper_media_stream_audio_track_host.cc',
       'renderer/pepper/pepper_media_stream_audio_track_host.h',
       'renderer/pepper/pepper_media_stream_track_host_base.cc',
       'renderer/pepper/pepper_media_stream_track_host_base.h',
       'renderer/pepper/pepper_media_stream_video_track_host.cc',
       'renderer/pepper/pepper_media_stream_video_track_host.h',
       'renderer/pepper/pepper_video_destination_host.cc',
       'renderer/pepper/pepper_video_destination_host.h',
       'renderer/pepper/pepper_video_source_host.cc',
       'renderer/pepper/pepper_video_source_host.h',
@@ skipping 21 matching lines @@
       ],
     }],
     ['OS=="win" and win_use_allocator_shim==1', {
       'dependencies': [
           '../base/allocator/allocator.gyp:allocator',
       ],
     }],
     ['OS=="android"', {
       'sources!': [
         'renderer/media/audio_decoder.cc',
+        'renderer/media/media_recorder_handler.cc',
+        'renderer/media/media_recorder_handler.h',
         'renderer/media/video_track_recorder.cc',
         'renderer/media/video_track_recorder.h',
-        'renderer/media/media_recorder_handler.cc',
-        'renderer/media/media_recorder_handler.h',
         'renderer/usb/type_converters.cc',
         'renderer/usb/type_converters.h',
         'renderer/usb/web_usb_client_impl.cc',
         'renderer/usb/web_usb_client_impl.h',
         'renderer/usb/web_usb_device_impl.cc',
         'renderer/usb/web_usb_device_impl.h',
       ],
       'sources': [
         'renderer/external_popup_menu.cc',
         'renderer/external_popup_menu.h',
@@ skipping 15 matching lines @@
         'renderer/java/gin_java_bridge_value_converter.h',
         'renderer/java/gin_java_function_invocation_helper.cc',
         'renderer/java/gin_java_function_invocation_helper.h',
       ],
       'dependencies': [
         '../device/devices_app/devices_app.gyp:device_usb_mojo_bindings_lib',
         '../device/devices_app/devices_app.gyp:devices_app_public_cpp',
         '../media/cast/cast.gyp:cast_sender',
       ]
     }],
-    # TODO(jrg): remove the OS=="android" section?
-    # http://crbug.com/113172
-    # Understand better how media_stream_ is tied into Chromium.
-    ['enable_webrtc==0 and OS=="android"', {
-      'sources/': [
-        ['exclude', '^renderer/media/media_stream_'],
-      ],
-    }],
     ['enable_webrtc==1', {
       'dependencies': [
         '../third_party/libjingle/libjingle.gyp:libjingle_webrtc',
         '../third_party/libjingle/libjingle.gyp:libpeerconnection',
         '../third_party/libyuv/libyuv.gyp:libyuv',
         '../third_party/webrtc/modules/modules.gyp:audio_device',
         '../third_party/webrtc/modules/modules.gyp:audio_processing',
         '../third_party/webrtc/p2p/p2p.gyp:libstunprober',
         '<(DEPTH)/crypto/crypto.gyp:crypto',
       ],
       'sources': [
         '<@(public_renderer_webrtc_sources)',
         '<@(private_renderer_webrtc_sources)',
       ],
     },{  # enable_webrtc==0
       'sources': [
         'renderer/media/webrtc_logging.h',
         'renderer/media/webrtc_logging_noop.cc',
       ],
+      # TODO(jrg): Understand better how media_stream_ is tied into Chromium,
+      # and maybe remove the OS=="android" section? http://crbug.com/113172
+      'conditions': [
+        ['OS=="android"', {
+          'sources/': [
+            ['exclude', '^renderer/media/media_stream_'],
+          ],
+        }],
+      ],
     }],
     ['enable_plugins==1', {
       'sources': [
         '<@(public_renderer_plugin_sources)',
         '<@(private_renderer_plugin_sources)',
       ],
       'conditions': [
         ['OS=="android"', {
           'sources!': [
             # Android does not build FFmpeg, which these depend on.
             'renderer/pepper/video_decoder_shim.cc',
             'renderer/pepper/video_decoder_shim.h',
             'renderer/pepper/video_encoder_shim.cc',
             'renderer/pepper/video_encoder_shim.h',
           ],
         }],
+        ['enable_webrtc==1', {
+          'sources': [
+            '<@(private_renderer_plugin_webrtc_sources)',
+          ],
+        }],
       ],
       'dependencies': [
         '../ppapi/ppapi_internal.gyp:ppapi_host',
         '../ppapi/ppapi_internal.gyp:ppapi_proxy',
         '../ppapi/ppapi_internal.gyp:ppapi_shared',
         '../third_party/libyuv/libyuv.gyp:libyuv',
       ],
-    }, {  # enable_plugins==0
-      'sources!': [
-        # These are not in the plugins sources list since it also requires webrtc.
-        'renderer/media/pepper_to_video_track_adapter.cc',
-        'renderer/media/pepper_to_video_track_adapter.h',
-      ],
-    }],
-    ['enable_plugins==1 and enable_webrtc==1', {
-      'sources': [
-        '<@(private_renderer_plugin_webrtc_sources)',
-      ],
     }],
     ['enable_pepper_cdms != 1', {
       'sources!': [
         'renderer/media/crypto/pepper_cdm_wrapper.h',
         'renderer/media/crypto/pepper_cdm_wrapper_impl.cc',
         'renderer/media/crypto/pepper_cdm_wrapper_impl.h',
         'renderer/media/crypto/ppapi_decryptor.cc',
         'renderer/media/crypto/ppapi_decryptor.h',
       ],
     }],
@@ skipping 18 matching lines @@
     }],
   ],
   'target_conditions': [
     ['OS=="android"', {
       'sources/': [
         ['include', '^renderer/render_view_linux\\.cc$'],
       ],
     }],
   ],
 }