[Cast] Clean-up: Merge RtpReceiver+AudioReceiver+VideoReceiver-->FrameReceiver.

media/cast/cast.gyp

Index: media/cast/cast.gyp
diff --git a/media/cast/cast.gyp b/media/cast/cast.gyp
index 4f0c2dd4a9d024fa199f3d1a8fac0b9c124890f8..45ff0162ece809b4af20575c6d95e6a770743b68 100644
--- a/media/cast/cast.gyp
+++ b/media/cast/cast.gyp
@@ -99,13 +99,7 @@
         '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
       ],
       'sources': [
-        'audio_receiver/audio_decoder.h',
-        'audio_receiver/audio_decoder.cc',
-        'audio_receiver/audio_receiver.h',
-        'audio_receiver/audio_receiver.cc',
         'cast_receiver.h',
-        'cast_receiver_impl.cc',
-        'cast_receiver_impl.h',
         'framer/cast_message_builder.cc',
         'framer/cast_message_builder.h',
         'framer/frame_buffer.cc',
@@ -114,18 +108,20 @@
         'framer/frame_id_map.h',
         'framer/framer.cc',
         'framer/framer.h',
+        'receiver/audio_decoder.cc',
+        'receiver/audio_decoder.h',
+        'receiver/cast_receiver_impl.cc',
+        'receiver/cast_receiver_impl.h',
+        'receiver/frame_receiver.cc',
+        'receiver/frame_receiver.h',
+        'receiver/video_decoder.cc',
+        'receiver/video_decoder.h',
         'rtp_receiver/receiver_stats.cc',
         'rtp_receiver/receiver_stats.h',
-        'rtp_receiver/rtp_receiver.cc',
-        'rtp_receiver/rtp_receiver.h',
         'rtp_receiver/rtp_receiver_defines.cc',
         'rtp_receiver/rtp_receiver_defines.h',
         'rtp_receiver/rtp_parser/rtp_parser.cc',
         'rtp_receiver/rtp_parser/rtp_parser.h',
-        'video_receiver/video_decoder.h',
-        'video_receiver/video_decoder.cc',
-        'video_receiver/video_receiver.h',
-        'video_receiver/video_receiver.cc',
       ], # source
     },
     {