Cast: Reshuffle files under media/cast

media/cast/cast_testing.gypi

 # Copyright 2014 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': 'cast_test_utility',
       'type': 'static_library',
       'include_dirs': [
          '<(DEPTH)/',
       ],
       'dependencies': [
         'cast_receiver',
-        'cast_transport',
+        'cast_net',

[wtc, 2014/07/11 22:31:35]

Nit: list in alphabetical order.

Please search for "cast_net' for other occurrences of this problem.

[Alpha Left Google, 2014/07/12 01:37:55]

Done.

         '<(DEPTH)/testing/gtest.gyp:gtest',
         '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
         '<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',
         '<(DEPTH)/third_party/mt19937ar/mt19937ar.gyp:mt19937ar',
         '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
       ],
       'sources': [
         'test/fake_media_source.cc',
         'test/fake_media_source.h',
         'test/fake_single_thread_task_runner.cc',
@@ skipping 26 matching lines @@
     },
     {
       'target_name': 'cast_unittests',
       'type': '<(gtest_target_type)',
       'include_dirs': [
         '<(DEPTH)/',
       ],
       'dependencies': [
         'cast_base',
         'cast_receiver',
-        'cast_rtcp',
         'cast_sender',
         'cast_test_utility',
         # Not a true dependency. This is here to make sure the CQ can verify
         # the tools compile correctly.
         'cast_tools',
-        'cast_transport',
+        'cast_net',
         '<(DEPTH)/base/base.gyp:test_support_base',
         '<(DEPTH)/net/net.gyp:net',
         '<(DEPTH)/testing/gmock.gyp:gmock',
         '<(DEPTH)/testing/gtest.gyp:gtest',
       ],
       'sources': [
         '<(DEPTH)/media/base/run_all_unittests.cc',
-        'audio_sender/audio_encoder_unittest.cc',
-        'audio_sender/audio_sender_unittest.cc',
-        'congestion_control/congestion_control_unittest.cc',
-        'framer/cast_message_builder_unittest.cc',
-        'framer/frame_buffer_unittest.cc',
-        'framer/framer_unittest.cc',
+        'net/rtp/cast_message_builder_unittest.cc',
+        'net/rtp/frame_buffer_unittest.cc',
+        'net/rtp/framer_unittest.cc',
         'logging/encoding_event_subscriber_unittest.cc',
         'logging/serialize_deserialize_test.cc',
         'logging/logging_impl_unittest.cc',
         'logging/logging_raw_unittest.cc',
         'logging/receiver_time_offset_estimator_impl_unittest.cc',
         'logging/simple_event_subscriber_unittest.cc',
         'logging/stats_event_subscriber_unittest.cc',
         'receiver/audio_decoder_unittest.cc',
         'receiver/frame_receiver_unittest.cc',
         'receiver/video_decoder_unittest.cc',
-        'rtcp/mock_rtcp_receiver_feedback.cc',
-        'rtcp/mock_rtcp_receiver_feedback.h',
-        'rtcp/mock_rtcp_sender_feedback.cc',
-        'rtcp/mock_rtcp_sender_feedback.h',
-        'rtcp/rtcp_receiver_unittest.cc',
-        'rtcp/rtcp_sender_unittest.cc',
-        'rtcp/rtcp_unittest.cc',
-        'rtcp/receiver_rtcp_event_subscriber_unittest.cc',
+        'net/rtcp/mock_rtcp_receiver_feedback.cc',
+        'net/rtcp/mock_rtcp_receiver_feedback.h',
+        'net/rtcp/mock_rtcp_sender_feedback.cc',
+        'net/rtcp/mock_rtcp_sender_feedback.h',
+        'net/rtcp/rtcp_receiver_unittest.cc',
+        'net/rtcp/rtcp_sender_unittest.cc',
+        'net/rtcp/rtcp_unittest.cc',
+        'net/rtcp/receiver_rtcp_event_subscriber_unittest.cc',

[wtc, 2014/07/11 22:31:36]

1. Nit: (this is a pre-existing problem) list this before
'net/rtcp/rtcp_receiver_unittest.cc'.

2. Nit: list all of these net/ files before logging/ files.

[Alpha Left Google, 2014/07/12 01:37:55]

Done.

 # TODO(miu): The following two are test utility modules.  Rename/move the files.
-        'rtcp/test_rtcp_packet_builder.cc',
-        'rtcp/test_rtcp_packet_builder.h',
-        'rtp_receiver/rtp_receiver_defines.h',
-        'rtp_receiver/mock_rtp_payload_feedback.cc',
-        'rtp_receiver/mock_rtp_payload_feedback.h',
-        'rtp_receiver/receiver_stats_unittest.cc',
-        'rtp_receiver/rtp_parser/test/rtp_packet_builder.cc',
-        'rtp_receiver/rtp_parser/rtp_parser_unittest.cc',
+        'net/rtcp/test_rtcp_packet_builder.cc',
+        'net/rtcp/test_rtcp_packet_builder.h',
+        'net/rtp/rtp_receiver_defines.h',
+        'net/rtp/mock_rtp_payload_feedback.cc',
+        'net/rtp/mock_rtp_payload_feedback.h',
+        'net/rtp/receiver_stats_unittest.cc',
+        'net/rtp/rtp_packet_builder.cc',
+        'net/rtp/rtp_parser_unittest.cc',
+        'sender/audio_encoder_unittest.cc',
+        'sender/audio_sender_unittest.cc',
+        'sender/congestion_control_unittest.cc',
+        'sender/external_video_encoder_unittest.cc',
+        'sender/video_encoder_impl_unittest.cc',
+        'sender/video_sender_unittest.cc',
         'test/end2end_unittest.cc',
         'test/fake_receiver_time_offset_estimator.cc',
         'test/fake_receiver_time_offset_estimator.h',
         'test/fake_single_thread_task_runner.cc',
         'test/fake_single_thread_task_runner.h',
         'test/fake_video_encode_accelerator.cc',
         'test/fake_video_encode_accelerator.h',
         'test/utility/audio_utility_unittest.cc',
         'test/utility/barcode_unittest.cc',
-        'transport/cast_transport_sender_impl_unittest.cc',
-        'transport/pacing/mock_paced_packet_sender.cc',
-        'transport/pacing/mock_paced_packet_sender.h',
-        'transport/pacing/paced_sender_unittest.cc',
-        'transport/rtp_sender/packet_storage/packet_storage_unittest.cc',
-        'transport/rtp_sender/rtp_packetizer/rtp_packetizer_unittest.cc',
-        'transport/rtp_sender/rtp_packetizer/test/rtp_header_parser.cc',
-        'transport/rtp_sender/rtp_packetizer/test/rtp_header_parser.h',
-        'transport/transport/udp_transport_unittest.cc',
-        'video_sender/external_video_encoder_unittest.cc',
-        'video_sender/video_encoder_impl_unittest.cc',
-        'video_sender/video_sender_unittest.cc',
+        'net/cast_transport_sender_impl_unittest.cc',
+        'net/pacing/mock_paced_packet_sender.cc',
+        'net/pacing/mock_paced_packet_sender.h',
+        'net/pacing/paced_sender_unittest.cc',
+        'net/rtp/packet_storage_unittest.cc',
+        'net/rtp/rtp_packetizer_unittest.cc',
+        'net/rtp/rtp_header_parser.cc',
+        'net/rtp/rtp_header_parser.h',
+        'net/udp_transport_unittest.cc',

[wtc, 2014/07/11 22:31:35]

Nit: list all of these net/ files before sender/ files.

[Alpha Left Google, 2014/07/12 01:37:55]

Done.

       ], # source
     },
     {
       'target_name': 'cast_benchmarks',
       'type': '<(gtest_target_type)',
       'include_dirs': [
         '<(DEPTH)/',
       ],
       'dependencies': [
         'cast_base',
         'cast_receiver',
-        'cast_rtcp',
         'cast_sender',
         'cast_test_utility',
-        'cast_transport',
+        'cast_net',
         '<(DEPTH)/base/base.gyp:test_support_base',
         '<(DEPTH)/net/net.gyp:net',
         '<(DEPTH)/testing/gtest.gyp:gtest',
       ],
       'sources': [
         'test/cast_benchmarks.cc',
         'test/fake_single_thread_task_runner.cc',
         'test/fake_single_thread_task_runner.h',
         'test/fake_video_encode_accelerator.cc',
         'test/fake_video_encode_accelerator.h',
@@ skipping 25 matching lines @@
     {
       'target_name': 'cast_receiver_app',
       'type': 'executable',
       'include_dirs': [
         '<(DEPTH)/',
       ],
       'dependencies': [
         'cast_base',
         'cast_receiver',
         'cast_test_utility',
-        'cast_transport',
+        'cast_net',
         '<(DEPTH)/net/net.gyp:net_test_support',
         '<(DEPTH)/media/media.gyp:media',
         '<(DEPTH)/testing/gtest.gyp:gtest',
         '<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',
       ],
       'sources': [
         '<(DEPTH)/media/cast/test/receiver.cc',
       ],
       'conditions': [
         ['OS == "linux" and use_x11==1', {
@@ skipping 12 matching lines @@
     {
       'target_name': 'cast_sender_app',
       'type': 'executable',
       'include_dirs': [
         '<(DEPTH)/',
       ],
       'dependencies': [
         'cast_base',
         'cast_sender',
         'cast_test_utility',
-        'cast_transport',
+        'cast_net',
         '<(DEPTH)/net/net.gyp:net_test_support',
         '<(DEPTH)/media/media.gyp:media',
         '<(DEPTH)/testing/gtest.gyp:gtest',
         '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
         '<(DEPTH)/third_party/opus/opus.gyp:opus',
         '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
       ],
       'sources': [
         '<(DEPTH)/media/cast/test/sender.cc',
       ],
     },
     {
       'target_name': 'cast_simulator',
       'type': 'executable',
       'include_dirs': [
         '<(DEPTH)/',
       ],
       'dependencies': [
         'cast_base',
         'cast_network_model_proto',
         'cast_sender',
         'cast_test_utility',
-        'cast_transport',
+        'cast_net',
         '<(DEPTH)/net/net.gyp:net_test_support',
         '<(DEPTH)/media/media.gyp:media',
         '<(DEPTH)/testing/gtest.gyp:gtest',
         '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
         '<(DEPTH)/third_party/opus/opus.gyp:opus',
         '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
       ],
       'sources': [
         '<(DEPTH)/media/cast/test/simulator.cc',
       ],
@@ skipping 31 matching lines @@
     },
     {
       'target_name': 'generate_timecode_audio',
       'type': 'executable',
       'include_dirs': [
         '<(DEPTH)/',
       ],
       'dependencies': [
         'cast_base',
         'cast_test_utility',
-        'cast_transport',
+        'cast_net',
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/media/media.gyp:media',
       ],
       'sources': [
         'test/utility/generate_timecode_audio.cc',
       ],
     },
     {
       'target_name': 'udp_proxy',
       'type': 'executable',
       'include_dirs': [
         '<(DEPTH)/',
       ],
       'dependencies': [
         'cast_test_utility',
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/media/media.gyp:media',
       ],
       'sources': [
         'test/utility/udp_proxy_main.cc',
       ],
     }
   ], # targets
 }