Reland: [Cast] Consolidate plethora of GYP files into cast.gyp and cast_testing.gypi.

Reland of r265481 (https://codereview.chromium.org/245893005/) with the
following fixes:

1. Re-introduce 'include_tests%' conditional.
2. Conditionally include all Cast utility app targets based on a new GYP
   variable: include_cast_utility_apps
3. Fixed compile errors exposed by landing r265481 on the tree.

Testing:

1. This change was tested by building on Linux:
   `build/gyp_chromium && ninja -C out/Debug All`
2. Confirmed absence of 'include_cast_utility_apps=1' in
   chromium.gyp_env will disable the Cast utility targets.
3. Ran utility apps to confirm the fixes.

R=hclam@chromium.org

Review URL: https://codereview.chromium.org/248083005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265690 0039d316-1c4b-4281-b951-d872f2087c98

29 files changed, 462 insertions, 835 deletions

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index b299b13..bdd25d2 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -62,7 +62,6 @@
         '../google_apis/gcm/gcm.gyp:gcm',
         '../google_apis/google_apis.gyp:google_apis',
         '../jingle/jingle.gyp:notifier',
-        '../media/cast/logging/logging.gyp:cast_common_logging',
         '../skia/skia.gyp:skia',
         '../sql/sql.gyp:sql',
         '../sync/sync.gyp:sync',
@@ -2589,7 +2588,7 @@
             '../components/components.gyp:visitedlink_browser',
             '../components/components.gyp:visitedlink_common',
             '../components/components.gyp:web_modal',
-            '../media/cast/transport/cast_transport.gyp:cast_transport',
+            '../media/cast/cast.gyp:cast_transport',
             '../media/media.gyp:media',
             '../net/net.gyp:net_with_v8',
             # TODO(tonyg): Remove this dependency (crbug.com/280157).
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 68052a5..4d95f87 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -45,7 +45,7 @@
         '<(DEPTH)/content/content.gyp:content_common',
         '<(DEPTH)/crypto/crypto.gyp:crypto',
         '<(DEPTH)/extensions/extensions_strings.gyp:extensions_strings',
-        '<(DEPTH)/media/cast/transport/cast_transport.gyp:cast_transport',
+        '<(DEPTH)/media/cast/cast.gyp:cast_transport',
         '<(DEPTH)/net/net.gyp:net',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index 7d16bb5..fbd29bd 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -22,10 +22,8 @@
         '../components/components.gyp:visitedlink_renderer',
         '../content/content.gyp:content_renderer',
         '../extensions/extensions.gyp:extensions_renderer',
-        '../media/cast/cast_config.gyp:cast_config',
-        '../media/cast/cast_sender.gyp:cast_sender',
-        '../media/cast/logging/logging.gyp:sender_logging',
-        '../media/cast/transport/cast_transport.gyp:cast_transport',
+        '../media/cast/cast.gyp:cast_sender',
+        '../media/cast/cast.gyp:cast_transport',
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
         '../third_party/WebKit/public/blink.gyp:blink',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 72c3058..44129a6 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -775,7 +775,7 @@
         '../device/bluetooth/bluetooth.gyp:device_bluetooth_mocks',
         '../extensions/common/api/api.gyp:extensions_api',
         '../google_apis/google_apis.gyp:google_apis_test_support',
-        '../media/cast/test/utility/utility.gyp:cast_test_utility',
+        '../media/cast/cast.gyp:cast_test_utility',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
@@ -1972,7 +1972,7 @@
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_base',
-        '../media/cast/test/utility/utility.gyp:cast_test_utility',
+        '../media/cast/cast.gyp:cast_test_utility',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
diff --git a/media/cast/audio_receiver/audio_receiver.gypi b/media/cast/audio_receiver/audio_receiver.gypi
deleted file mode 100644
index 048227c..0000000
--- a/media/cast/audio_receiver/audio_receiver.gypi
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 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.
-
-{
-  'targets': [
-    {
-      'target_name': 'cast_audio_receiver',
-      'type': 'static_library',
-      'include_dirs': [
-        '<(DEPTH)/',
-        '<(DEPTH)/third_party/',
-        '<(DEPTH)/third_party/webrtc/',
-      ],
-      'sources': [
-        'audio_decoder.h',
-        'audio_decoder.cc',
-        'audio_receiver.h',
-        'audio_receiver.cc',
-      ], # source
-      'dependencies': [
-        '<(DEPTH)/media/media.gyp:media',
-        '<(DEPTH)/media/media.gyp:shared_memory_support',
-        '<(DEPTH)/media/cast/transport/utility/utility.gyp:transport_utility',
-        '<(DEPTH)/media/cast/rtcp/rtcp.gyp:cast_rtcp',
-        '<(DEPTH)/media/cast/rtp_receiver/rtp_receiver.gyp:cast_rtp_receiver',
-        '<(DEPTH)/third_party/opus/opus.gyp:opus',
-      ],
-    },
-  ],
-}
diff --git a/media/cast/audio_sender/audio_sender.gypi b/media/cast/audio_sender/audio_sender.gypi
deleted file mode 100644
index 4953140..0000000
--- a/media/cast/audio_sender/audio_sender.gypi
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 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.
-
-{
-  'targets': [
-    {
-      'target_name': 'audio_sender',
-      'type': 'static_library',
-      'include_dirs': [
-        '<(DEPTH)/',
-        '<(DEPTH)/third_party/',
-      ],
-      'sources': [
-        'audio_encoder.h',
-        'audio_encoder.cc',
-        'audio_sender.h',
-        'audio_sender.cc',
-      ], # source
-      'dependencies': [
-        '<(DEPTH)/media/media.gyp:media',
-        '<(DEPTH)/media/media.gyp:shared_memory_support',
-        '<(DEPTH)/media/cast/rtcp/rtcp.gyp:cast_rtcp',
-        '<(DEPTH)/media/cast/transport/cast_transport.gyp:cast_transport',
-        '<(DEPTH)/third_party/opus/opus.gyp:opus',
-      ],
-    },
-  ],
-}
-
-
diff --git a/media/cast/cast.gyp b/media/cast/cast.gyp
index f0a77f2..b50c5ee 100644
--- a/media/cast/cast.gyp
+++ b/media/cast/cast.gyp
@@ -7,144 +7,223 @@
     'include_tests%': 1,
     'chromium_code': 1,
   },
-  'targets': [
-  ],  # targets,
   'conditions': [
     ['include_tests==1', {
-      'targets': [
-        {
-          'target_name': 'cast_unittests',
-          'type': '<(gtest_target_type)',
-          'dependencies': [
-            'cast_config.gyp:cast_config',
-            'cast_receiver.gyp:cast_receiver',
-            'cast_sender.gyp:cast_sender',
-            'logging/logging.gyp:cast_log_analysis',
-            'logging/logging.gyp:cast_logging_proto_lib',
-            'logging/logging.gyp:sender_logging',
-            'test/utility/utility.gyp:cast_test_utility',
-            'transport/cast_transport.gyp:cast_transport',
-            '<(DEPTH)/base/base.gyp:test_support_base',
-            '<(DEPTH)/net/net.gyp:net',
-            '<(DEPTH)/testing/gmock.gyp:gmock',
-            '<(DEPTH)/testing/gtest.gyp:gtest',
-          ],
-          'include_dirs': [
-            '<(DEPTH)/',
-            '<(DEPTH)/third_party/',
-            '<(DEPTH)/third_party/webrtc/',
-          ],
-          'sources': [
-            '<(DEPTH)/media/base/run_all_unittests.cc',
-            'audio_receiver/audio_decoder_unittest.cc',
-            'audio_receiver/audio_receiver_unittest.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',
-            'logging/encoding_event_subscriber_unittest.cc',
-            'logging/serialize_deserialize_test.cc',
-            'logging/logging_impl_unittest.cc',
-            'logging/logging_raw_unittest.cc',
-            'logging/simple_event_subscriber_unittest.cc',
-            'logging/stats_event_subscriber_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',
-            'rtcp/sender_rtcp_event_subscriber_unittest.cc',
-            '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',
-            'test/end2end_unittest.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',
-            '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_receiver/video_decoder_unittest.cc',
-            'video_receiver/video_receiver_unittest.cc',
-            'video_sender/external_video_encoder_unittest.cc',
-            'video_sender/video_encoder_impl_unittest.cc',
-            'video_sender/video_sender_unittest.cc',
-          ], # source
-        },
-        {
-          'target_name': 'cast_sender_app',
-          'type': 'executable',
-          'include_dirs': [
-            '<(DEPTH)/',
-          ],
-          'dependencies': [
-            'cast_config.gyp:cast_config',
-            'logging/logging.gyp:sender_logging',
-            '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
-            '<(DEPTH)/net/net.gyp:net_test_support',
-            '<(DEPTH)/media/cast/cast_sender.gyp:*',
-            '<(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)/media/cast/transport/cast_transport.gyp:cast_transport',
-            '<(DEPTH)/media/cast/test/utility/utility.gyp:cast_test_utility',
-          ],
-          'sources': [
-            '<(DEPTH)/media/cast/test/sender.cc',
-          ],
-        },
-        {
-          'target_name': 'cast_receiver_app',
-          'type': 'executable',
-          'include_dirs': [
-            '<(DEPTH)/',
-          ],
-          'dependencies': [
-            'cast_config.gyp:cast_config',
-            '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
-            '<(DEPTH)/net/net.gyp:net_test_support',
-            '<(DEPTH)/media/cast/cast_receiver.gyp:*',
-            '<(DEPTH)/media/media.gyp:media',
-            '<(DEPTH)/testing/gtest.gyp:gtest',
-            '<(DEPTH)/media/cast/transport/cast_transport.gyp:cast_transport',
-            '<(DEPTH)/media/cast/test/utility/utility.gyp:cast_test_utility',
-            '<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',
-          ],
-          'sources': [
-            '<(DEPTH)/media/cast/test/receiver.cc',
-          ],
-          'conditions': [
-            ['OS == "linux" and use_x11==1', {
-              'dependencies': [
-                '<(DEPTH)/build/linux/system.gyp:x11',
-                '<(DEPTH)/build/linux/system.gyp:xext',
-              ],
-              'sources': [
-                '<(DEPTH)/media/cast/test/linux_output_window.cc',
-                '<(DEPTH)/media/cast/test/linux_output_window.h',
-              ],
-          }],
-          ],
-        },
-      ],  # targets
-    }], # include_tests
+      'includes': [ 'cast_testing.gypi' ]
+    }],
+  ],
+  'targets': [
+    {
+      'target_name': 'cast_base',
+      'type': 'static_library',
+      'include_dirs': [
+        '<(DEPTH)/',
+      ],
+      'dependencies': [
+        'cast_logging_proto',
+        '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/net/net.gyp:net',
+      ],
+      'export_dependent_settings': [
+        'cast_logging_proto',
+      ],
+      'sources': [
+        'cast_config.cc',
+        'cast_config.h',
+        'cast_defines.h',
+        'cast_environment.cc',
+        'cast_environment.h',
+        'logging/encoding_event_subscriber.cc',
+        'logging/encoding_event_subscriber.h',
+        'logging/log_deserializer.cc',
+        'logging/log_deserializer.h',
+        'logging/log_serializer.cc',
+        'logging/log_serializer.h',
+        'logging/logging_defines.cc',
+        'logging/logging_defines.h',
+        'logging/logging_impl.cc',
+        'logging/logging_impl.h',
+        'logging/logging_raw.cc',
+        'logging/logging_raw.h',
+        'logging/raw_event_subscriber.h',
+        'logging/simple_event_subscriber.cc',
+        'logging/simple_event_subscriber.h',
+        'logging/stats_event_subscriber.cc',
+        'logging/stats_event_subscriber.h',
+        'logging/stats_util.cc',
+        'logging/stats_util.h',
+        'transport/cast_transport_config.cc',
+        'transport/cast_transport_config.h',
+        'transport/cast_transport_defines.h',
+        'transport/cast_transport_sender.h',
+      ], # source
+    },
+    {
+      'target_name': 'cast_logging_proto',
+      'type': 'static_library',
+      'include_dirs': [
+        '<(DEPTH)/',
+      ],
+      'sources': [
+        'logging/proto/proto_utils.cc',
+        'logging/proto/raw_events.proto',
+      ],
+      'variables': {
+        'proto_in_dir': 'logging/proto',
+        'proto_out_dir': 'media/cast/logging/proto',
+      },
+      'includes': ['../../build/protoc.gypi'],
+    },
+    {
+      'target_name': 'cast_receiver',
+      'type': 'static_library',
+      'include_dirs': [
+        '<(DEPTH)/',
+# TODO(miu): Remove WebRTC dependency (RtpHeader), and then these two deps: 
+        '<(DEPTH)/third_party/',
+        '<(DEPTH)/third_party/webrtc/',
+      ],
+      'dependencies': [
+        'cast_base',
+        'cast_rtcp',
+        'cast_transport',
+        '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/media/media.gyp:media',
+        '<(DEPTH)/media/media.gyp:shared_memory_support',
+        '<(DEPTH)/third_party/opus/opus.gyp:opus',
+        '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx',
+        '<(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',
+        'framer/frame_buffer.h',
+        'framer/frame_id_map.cc',
+        'framer/frame_id_map.h',
+        'framer/framer.cc',
+        'framer/framer.h',
+        'rtp_receiver/receiver_stats.cc',
+        'rtp_receiver/receiver_stats.h',
+        'rtp_receiver/rtp_receiver.cc',
+        'rtp_receiver/rtp_receiver.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
+    },
+    {
+      'target_name': 'cast_rtcp',
+      'type': 'static_library',
+      'include_dirs': [
+        '<(DEPTH)/',
+      ],
+      'dependencies': [
+        'cast_base',
+        'cast_transport',
+        '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/net/net.gyp:net',
+      ],
+      'sources': [
+        'rtcp/rtcp_defines.cc',
+        'rtcp/rtcp_defines.h',
+        'rtcp/rtcp.h',
+        'rtcp/rtcp.cc',
+        'rtcp/rtcp_receiver.cc',
+        'rtcp/rtcp_receiver.h',
+        'rtcp/rtcp_sender.cc',
+        'rtcp/rtcp_sender.h',
+        'rtcp/rtcp_utility.cc',
+        'rtcp/rtcp_utility.h',
+        'rtcp/sender_rtcp_event_subscriber.cc',
+        'rtcp/sender_rtcp_event_subscriber.h',
+        'rtcp/receiver_rtcp_event_subscriber.cc',
+        'rtcp/receiver_rtcp_event_subscriber.cc',
+      ], # source
+    },
+    {
+      'target_name': 'cast_sender',
+      'type': 'static_library',
+      'include_dirs': [
+        '<(DEPTH)/',
+      ],
+      'dependencies': [
+        'cast_base',
+        'cast_rtcp',
+        'cast_transport',
+        '<(DEPTH)/media/media.gyp:media',
+        '<(DEPTH)/media/media.gyp:shared_memory_support',
+        '<(DEPTH)/third_party/opus/opus.gyp:opus',
+        '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx',
+      ], # dependencies
+      'sources': [
+        'audio_sender/audio_encoder.h',
+        'audio_sender/audio_encoder.cc',
+        'audio_sender/audio_sender.h',
+        'audio_sender/audio_sender.cc',
+        'cast_sender.h',
+        'cast_sender_impl.cc',
+        'cast_sender_impl.h',
+        'congestion_control/congestion_control.h',
+        'congestion_control/congestion_control.cc',
+        'video_sender/codecs/vp8/vp8_encoder.cc',
+        'video_sender/codecs/vp8/vp8_encoder.h',
+        'video_sender/external_video_encoder.h',
+        'video_sender/external_video_encoder.cc',
+        'video_sender/fake_software_video_encoder.h',
+        'video_sender/fake_software_video_encoder.cc',
+        'video_sender/software_video_encoder.h',
+        'video_sender/video_encoder.h',
+        'video_sender/video_encoder_impl.h',
+        'video_sender/video_encoder_impl.cc',
+        'video_sender/video_sender.h',
+        'video_sender/video_sender.cc',
+      ], # source
+    },
+    {
+      'target_name': 'cast_transport',
+      'type': 'static_library',
+      'include_dirs': [
+        '<(DEPTH)/',
+      ],
+      'dependencies': [
+        'cast_base',
+        '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/crypto/crypto.gyp:crypto',
+        '<(DEPTH)/net/net.gyp:net',
+      ],
+      'sources': [
+        'transport/cast_transport_sender_impl.cc',
+        'transport/cast_transport_sender_impl.h',
+        'transport/pacing/paced_sender.cc',
+        'transport/pacing/paced_sender.h',
+        'transport/rtcp/rtcp_builder.cc',
+        'transport/rtcp/rtcp_builder.h',
+        'transport/rtp_sender/packet_storage/packet_storage.cc',
+        'transport/rtp_sender/packet_storage/packet_storage.h',
+        'transport/rtp_sender/rtp_packetizer/rtp_packetizer.cc',
+        'transport/rtp_sender/rtp_packetizer/rtp_packetizer.h',
+        'transport/rtp_sender/rtp_sender.cc',
+        'transport/rtp_sender/rtp_sender.h',
+        'transport/transport/udp_transport.cc',
+        'transport/transport/udp_transport.h',
+        'transport/transport_audio_sender.cc',
+        'transport/transport_audio_sender.h',
+        'transport/transport_video_sender.cc',
+        'transport/transport_video_sender.h',
+        'transport/utility/transport_encryption_handler.cc',
+        'transport/utility/transport_encryption_handler.h',
+      ], # source
+    },
   ],
 }
diff --git a/media/cast/cast_config.gyp b/media/cast/cast_config.gyp
deleted file mode 100644
index 21d83c9..0000000
--- a/media/cast/cast_config.gyp
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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.
-
-{
-  'variables': {
-    'include_tests%': 1,
-    'chromium_code': 1,
-  },
-  'targets': [
-    {
-      'target_name': 'cast_config',
-      'type': 'static_library',
-      'include_dirs': [
-        '<(DEPTH)/',
-      ],
-      'dependencies': [
-        '<(DEPTH)/base/base.gyp:base',
-      ],
-      'sources': [
-        'cast_config.cc',
-        'cast_config.h',
-        'cast_defines.h',
-        'cast_environment.cc',
-        'cast_environment.h',
-      ], # source
-    },
-  ],
-}
diff --git a/media/cast/cast_receiver.gyp b/media/cast/cast_receiver.gyp
deleted file mode 100644
index 087b219..0000000
--- a/media/cast/cast_receiver.gyp
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 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': {
-    'chromium_code': 1,
-  },
-  'includes': [
-     'audio_receiver/audio_receiver.gypi',
-     'video_receiver/video_receiver.gypi',
-  ],
-  'targets': [
-    {
-      'target_name': 'cast_receiver',
-      'type': 'static_library',
-      'include_dirs': [
-        '<(DEPTH)/',
-        '<(DEPTH)/third_party/',
-        '<(DEPTH)/third_party/webrtc/',
-      ],
-      'sources': [
-        'cast_receiver.h',
-        'cast_receiver_impl.cc',
-        'cast_receiver_impl.h',
-      ], # source
-      'dependencies': [
-        '<(DEPTH)/media/cast/transport/cast_transport.gyp:cast_transport',
-        'cast_audio_receiver',
-        'cast_video_receiver',
-        'rtp_receiver/rtp_receiver.gyp:cast_rtp_receiver',
-      ],
-    },
-  ],
-}
diff --git a/media/cast/cast_sender.gyp b/media/cast/cast_sender.gyp
deleted file mode 100644
index bc4e825..0000000
--- a/media/cast/cast_sender.gyp
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 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': {
-    'chromium_code': 1,
-  },
-  'includes': [
-    'audio_sender/audio_sender.gypi',
-    'congestion_control/congestion_control.gypi',
-    'video_sender/video_sender.gypi',
-  ],
-  'targets': [
-    {
-      'target_name': 'cast_sender',
-      'type': 'static_library',
-      'include_dirs': [
-        '<(DEPTH)/',
-      ],
-      'sources': [
-        'cast_sender.h',
-        'cast_sender_impl.cc',
-        'cast_sender_impl.h',
-      ], # source
-      'dependencies': [
-        '<(DEPTH)/media/cast/transport/cast_transport.gyp:cast_transport',
-        'audio_sender',
-        'congestion_control',
-        'rtcp/rtcp.gyp:cast_rtcp',
-        'video_sender',
-      ], # dependencies
-    },
-  ],
-}
diff --git a/media/cast/cast_testing.gypi b/media/cast/cast_testing.gypi
new file mode 100644
index 0000000..bcf6676
--- /dev/null
+++ b/media/cast/cast_testing.gypi
@@ -0,0 +1,231 @@
+# 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.
+
+{
+  'variables': {
+    'include_cast_utility_apps%': 0,
+  },
+  'targets': [
+    {
+      'target_name': 'cast_test_utility',
+      'type': 'static_library',
+      'include_dirs': [
+         '<(DEPTH)/',
+      ],
+      'dependencies': [
+        'cast_receiver',
+        'cast_transport',
+        '<(DEPTH)/testing/gtest.gyp:gtest',
+        '<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',
+        '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
+      ],
+      'sources': [
+        'test/fake_single_thread_task_runner.cc',
+        'test/fake_single_thread_task_runner.h',
+        'test/utility/audio_utility.cc',
+        'test/utility/audio_utility.h',
+        'test/utility/barcode.cc',
+        'test/utility/barcode.h',
+        'test/utility/default_config.cc',
+        'test/utility/default_config.h',
+        'test/utility/in_process_receiver.cc',
+        'test/utility/in_process_receiver.h',
+        'test/utility/input_builder.cc',
+        'test/utility/input_builder.h',
+        'test/utility/standalone_cast_environment.cc',
+        'test/utility/standalone_cast_environment.h',
+        'test/utility/video_utility.cc',
+        'test/utility/video_utility.h',
+        'test/utility/udp_proxy.cc',
+        'test/utility/udp_proxy.h',
+      ], # source
+    },
+    {
+      'target_name': 'cast_unittests',
+      'type': '<(gtest_target_type)',
+      'include_dirs': [
+        '<(DEPTH)/',
+# TODO(miu): Remove WebRTC dependency (RtpHeader), and then these two deps:
+        '<(DEPTH)/third_party/',
+        '<(DEPTH)/third_party/webrtc/',
+      ],
+      'dependencies': [
+        'cast_base',
+        'cast_receiver',
+        'cast_rtcp',
+        'cast_sender',
+        'cast_test_utility',
+        'cast_transport',
+        '<(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_receiver/audio_decoder_unittest.cc',
+        'audio_receiver/audio_receiver_unittest.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',
+        'logging/encoding_event_subscriber_unittest.cc',
+        'logging/serialize_deserialize_test.cc',
+        'logging/logging_impl_unittest.cc',
+        'logging/logging_raw_unittest.cc',
+        'logging/simple_event_subscriber_unittest.cc',
+        'logging/stats_event_subscriber_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',
+        'rtcp/sender_rtcp_event_subscriber_unittest.cc',
+# 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',
+        'test/end2end_unittest.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',
+        '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_receiver/video_decoder_unittest.cc',
+        'video_receiver/video_receiver_unittest.cc',
+        'video_sender/external_video_encoder_unittest.cc',
+        'video_sender/video_encoder_impl_unittest.cc',
+        'video_sender/video_sender_unittest.cc',
+      ], # source
+    },
+  ], # targets
+  'conditions': [
+    ['include_cast_utility_apps==1', {
+      'targets': [
+        {
+          'target_name': 'cast_receiver_app',
+          'type': 'executable',
+          'include_dirs': [
+            '<(DEPTH)/',
+          ],
+          'dependencies': [
+            'cast_base',
+            'cast_receiver',
+            'cast_test_utility',
+            'cast_transport',
+            '<(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', {
+              'dependencies': [
+                '<(DEPTH)/build/linux/system.gyp:x11',
+                '<(DEPTH)/build/linux/system.gyp:xext',
+              ],
+              'sources': [
+                '<(DEPTH)/media/cast/test/linux_output_window.cc',
+                '<(DEPTH)/media/cast/test/linux_output_window.h',
+                '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
+              ],
+            }],
+          ],
+        },
+        {
+          'target_name': 'cast_sender_app',
+          'type': 'executable',
+          'include_dirs': [
+            '<(DEPTH)/',
+          ],
+          'dependencies': [
+            'cast_base',
+            'cast_sender',
+            'cast_test_utility',
+            'cast_transport',
+            '<(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': 'generate_barcode_video',
+          'type': 'executable',
+          'include_dirs': [
+            '<(DEPTH)/',
+          ],
+          'dependencies': [
+            'cast_test_utility',
+            '<(DEPTH)/base/base.gyp:base',
+            '<(DEPTH)/media/media.gyp:media',
+          ],
+          'sources': [
+            'test/utility/generate_barcode_video.cc',
+          ],
+        },
+        {
+          'target_name': 'generate_timecode_audio',
+          'type': 'executable',
+          'include_dirs': [
+            '<(DEPTH)/',
+          ],
+          'dependencies': [
+            'cast_base',
+            'cast_test_utility',
+            'cast_transport',
+            '<(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
+    }],
+  ], # conditions
+}
diff --git a/media/cast/congestion_control/congestion_control.gypi b/media/cast/congestion_control/congestion_control.gypi
deleted file mode 100644
index 20a57ca..0000000
--- a/media/cast/congestion_control/congestion_control.gypi
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 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.
-
-{
-  'targets': [
-    {
-      'target_name': 'congestion_control',
-      'type': 'static_library',
-      'include_dirs': [
-        '<(DEPTH)/',
-      ],
-      'sources': [
-        'congestion_control.h',
-        'congestion_control.cc',
-      ], # source
-      'dependencies': [
-        '<(DEPTH)/base/base.gyp:base',
-      ],
-  },
-  ],
-}
-
diff --git a/media/cast/framer/framer.gyp b/media/cast/framer/framer.gyp
deleted file mode 100644
index e72ac84..0000000
--- a/media/cast/framer/framer.gyp
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 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': {
-    'chromium_code': 1,
-  },
-  'targets': [
-    {
-      'target_name': 'cast_framer',
-      'type': 'static_library',
-      'include_dirs': [
-        '<(DEPTH)/',
-        '<(DEPTH)/media/cast/transport/cast_transport.gyp:cast_transport',
-        '<(DEPTH)/third_party/',
-        '<(DEPTH)/third_party/webrtc',
-      ],
-      'sources': [
-        'cast_message_builder.cc',
-        'cast_message_builder.h',
-        'frame_buffer.cc',
-        'frame_buffer.h',
-        'frame_id_map.cc',
-        'frame_id_map.h',
-        'framer.cc',
-        'framer.h',
-      ],
-    },
-  ], # targets
-}
diff --git a/media/cast/logging/logging.gyp b/media/cast/logging/logging.gyp
deleted file mode 100644
index 29a96d8..0000000
--- a/media/cast/logging/logging.gyp
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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.
-{
-  'variables': {
-    'chromium_code': 1,
-  },
-  'targets': [
-    {
-      'target_name': 'cast_common_logging',
-      'type': 'static_library',
-      'include_dirs': [
-        '<(DEPTH)/',
-      ],
-      'dependencies': [
-        'cast_logging_proto_lib',
-        '<(DEPTH)/base/base.gyp:base',
-      ],
-      'export_dependent_settings': [
-        'cast_logging_proto_lib',
-      ],
-      'sources': [
-        'logging_defines.cc',
-        'logging_defines.h',
-        'logging_impl.cc',
-        'logging_impl.h',
-        'logging_raw.cc',
-        'logging_raw.h',
-        'raw_event_subscriber.h',
-        'simple_event_subscriber.cc',
-        'simple_event_subscriber.h',
-        'stats_event_subscriber.cc',
-        'stats_event_subscriber.h',
-        'stats_util.cc',
-        'stats_util.h',
-      ], # source
-    },
-    {
-      'target_name': 'sender_logging',
-      'type': 'static_library',
-      'include_dirs': [
-        '<(DEPTH)/',
-      ],
-      'dependencies': [
-        'cast_common_logging',
-        'cast_logging_proto_lib',
-        '<(DEPTH)/base/base.gyp:base',
-      ],
-      'export_dependent_settings': [
-        'cast_logging_proto_lib',
-      ],
-      'sources': [
-        'encoding_event_subscriber.cc',
-        'encoding_event_subscriber.h',
-        'log_serializer.cc',
-        'log_serializer.h',
-      ], # source
-    },
-    {
-      'target_name': 'cast_logging_proto_lib',
-      'type': 'static_library',
-      'sources': [
-        'proto/proto_utils.cc',
-        'proto/raw_events.proto',
-      ],
-      'variables': {
-        'proto_in_dir': 'proto',
-        'proto_out_dir': 'media/cast/logging/proto',
-      },
-      'includes': ['../../../build/protoc.gypi'],
-    },
-    {
-      'target_name': 'cast_log_analysis',
-      'type': 'static_library',
-      'include_dirs': [
-        '<(DEPTH)/',
-      ],
-      'dependencies': [
-        'cast_logging_proto_lib',
-        'sender_logging',
-        '<(DEPTH)/base/base.gyp:base',
-      ],
-      'export_dependent_settings': [
-        'cast_logging_proto_lib',
-      ],
-      'sources': [
-        'log_deserializer.cc',
-        'log_deserializer.h',
-      ], # source
-    },
-  ],
-}
diff --git a/media/cast/rtcp/rtcp.gyp b/media/cast/rtcp/rtcp.gyp
deleted file mode 100644
index d6e3e64..0000000
--- a/media/cast/rtcp/rtcp.gyp
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 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': {
-    'chromium_code': 1,
-  },
-  'targets': [
-    {
-      'target_name': 'cast_rtcp',
-      'type': 'static_library',
-      'include_dirs': [
-        '<(DEPTH)/',
-      ],
-      'sources': [
-        'rtcp_defines.cc',
-        'rtcp_defines.h',
-        'rtcp.h',
-        'rtcp.cc',
-        'rtcp_receiver.cc',
-        'rtcp_receiver.h',
-        'rtcp_sender.cc',
-        'rtcp_sender.h',
-        'rtcp_utility.cc',
-        'rtcp_utility.h',
-        'sender_rtcp_event_subscriber.cc',
-        'sender_rtcp_event_subscriber.h',
-        'receiver_rtcp_event_subscriber.cc',
-        'receiver_rtcp_event_subscriber.cc',
-      ], # source
-      'dependencies': [
-        '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/media/cast/transport/cast_transport.gyp:cast_transport',
-        '<(DEPTH)/net/net.gyp:net',
-      ],
-    },
-    {
-      'target_name': 'cast_rtcp_test',
-      'type': 'static_library',
-      'include_dirs': [
-        '<(DEPTH)/',
-      ],
-      'sources': [
-        'test_rtcp_packet_builder.cc',
-        'test_rtcp_packet_builder.h',
-      ], # source
-      'dependencies': [
-        'cast_rtcp',
-        '<(DEPTH)/media/cast/transport/cast_transport.gyp:cast_transport',
-        '<(DEPTH)/testing/gtest.gyp:gtest',
-      ],
-    },
-  ],
-}
-
diff --git a/media/cast/rtp_receiver/rtp_parser/rtp_parser.gyp b/media/cast/rtp_receiver/rtp_parser/rtp_parser.gyp
deleted file mode 100644
index 533533f..0000000
--- a/media/cast/rtp_receiver/rtp_parser/rtp_parser.gyp
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 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': {
-    'chromium_code': 1,
-  },
-  'targets': [
-    {
-      'target_name': 'cast_rtp_parser',
-      'type': 'static_library',
-      'include_dirs': [
-        '<(DEPTH)/',
-        '<(DEPTH)/third_party/',
-      ],
-      'sources': [
-        'rtp_parser.cc',
-        'rtp_parser.h',
-      ], # source
-      'dependencies': [
-        '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/media/cast/transport/cast_transport.gyp:cast_transport',
-      ],
-    },
-  ],
-}
diff --git a/media/cast/rtp_receiver/rtp_receiver.gyp b/media/cast/rtp_receiver/rtp_receiver.gyp
deleted file mode 100644
index bd1c1fa..0000000
--- a/media/cast/rtp_receiver/rtp_receiver.gyp
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 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': {
-    'chromium_code': 1,
-  },
-  'targets': [
-    {
-      'target_name': 'cast_rtp_receiver',
-      'type': 'static_library',
-      'include_dirs': [
-        '<(DEPTH)/',
-        '<(DEPTH)/third_party/',
-      ],
-      'sources': [
-        'receiver_stats.cc',
-        'receiver_stats.h',
-        'rtp_receiver.cc',
-        'rtp_receiver.h',
-      ], # source
-      'dependencies': [
-        '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/media/cast/transport/cast_transport.gyp:cast_transport',
-        'rtp_parser/rtp_parser.gyp:*',
-      ],
-    },
-  ],
-}
diff --git a/media/cast/test/utility/generate_barcode_video.cc b/media/cast/test/utility/generate_barcode_video.cc
index b84649e..e917ecd 100644
--- a/media/cast/test/utility/generate_barcode_video.cc
+++ b/media/cast/test/utility/generate_barcode_video.cc
@@ -5,13 +5,14 @@
 #include <cstdio>
 #include <cstdlib>
 
+#include "base/logging.h"
 #include "media/base/video_frame.h"
 #include "media/cast/test/utility/barcode.h"
 
 void DumpPlane(scoped_refptr<media::VideoFrame> frame,
                int plane) {
   for (int row = 0; row < frame->rows(plane); row++) {
-    CHECK_EQ(frame->row_bytes(plane),
+    CHECK_EQ(static_cast<size_t>(frame->row_bytes(plane)),
              fwrite(frame->data(plane) + frame->stride(plane) * row,
                     1,
                     frame->row_bytes(plane),
diff --git a/media/cast/test/utility/generate_timecode_audio.cc b/media/cast/test/utility/generate_timecode_audio.cc
index 2681a53..219a8e1 100644
--- a/media/cast/test/utility/generate_timecode_audio.cc
+++ b/media/cast/test/utility/generate_timecode_audio.cc
@@ -8,6 +8,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/logging.h"
 #include "media/cast/test/utility/audio_utility.h"
 
 const size_t kSamplingFrequency = 48000;
diff --git a/media/cast/test/utility/udp_proxy_main.cc b/media/cast/test/utility/udp_proxy_main.cc
index 58019b4..68a885f 100644
--- a/media/cast/test/utility/udp_proxy_main.cc
+++ b/media/cast/test/utility/udp_proxy_main.cc
@@ -10,6 +10,7 @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
+#include "base/message_loop/message_loop.h"
 #include "media/cast/test/utility/udp_proxy.h"
 
 int main(int argc, char** argv) {
@@ -56,8 +57,6 @@ int main(int argc, char** argv) {
                                           in_pipe.Pass(),
                                           out_pipe.Pass(),
                                           NULL));
-  while (true) {
-    sleep(1000);
-  }
+  base::MessageLoop().Run();  // Run forever.
   return 1;
 }
diff --git a/media/cast/test/utility/utility.gyp b/media/cast/test/utility/utility.gyp
deleted file mode 100644
index e8deb80..0000000
--- a/media/cast/test/utility/utility.gyp
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 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': {
-    'chromium_code': 1,
-  },
-  'targets': [
-    {
-      'target_name': 'cast_test_utility',
-      'type': 'static_library',
-      'include_dirs': [
-         '<(DEPTH)/',
-      ],
-      'dependencies': [
-        '../../cast_receiver.gyp:cast_receiver',
-        '../../transport/cast_transport.gyp:cast_transport',
-        '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
-        '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
-        '<(DEPTH)/testing/gtest.gyp:gtest',
-        '<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',
-
-      ],
-      'sources': [
-        '<(DEPTH)/media/cast/test/fake_single_thread_task_runner.cc',
-        '<(DEPTH)/media/cast/test/fake_single_thread_task_runner.h',
-        'audio_utility.cc',
-        'audio_utility.h',
-        'barcode.cc',
-        'barcode.h',
-        'default_config.cc',
-        'default_config.h',
-        'in_process_receiver.cc',
-        'in_process_receiver.h',
-        'input_builder.cc',
-        'input_builder.h',
-        'standalone_cast_environment.cc',
-        'standalone_cast_environment.h',
-        'video_utility.cc',
-        'video_utility.h',
-        'udp_proxy.cc',
-        'udp_proxy.h',
-      ], # source
-    },
-    {
-      'target_name': 'generate_barcode_video',
-      'type': 'executable',
-      'include_dirs': [
-        '<(DEPTH)/',
-      ],
-      'dependencies': [
-        '<(DEPTH)/media/media.gyp:media',
-        '<(DEPTH)/media/cast/test/utility/utility.gyp:cast_test_utility',
-      ],
-      'sources': [
-        '<(DEPTH)/media/cast/test/utility/generate_barcode_video.cc',
-      ],
-    },
-    {
-      'target_name': 'generate_timecode_audio',
-      'type': 'executable',
-      'include_dirs': [
-        '<(DEPTH)/',
-      ],
-      'dependencies': [
-        '<(DEPTH)/media/cast/cast_config.gyp:cast_config',
-        '<(DEPTH)/media/cast/test/utility/utility.gyp:cast_test_utility',
-        '<(DEPTH)/media/cast/transport/cast_transport.gyp:cast_transport',
-        '<(DEPTH)/media/media.gyp:media',
-      ],
-      'sources': [
-        '<(DEPTH)/media/cast/test/utility/generate_timecode_audio.cc',
-      ],
-    },
-    {
-      'target_name': 'udp_proxy',
-      'type': 'executable',
-      'include_dirs': [
-        '<(DEPTH)/',
-      ],
-      'dependencies': [
-        '<(DEPTH)/media/media.gyp:media',
-        '<(DEPTH)/media/cast/test/utility/utility.gyp:cast_test_utility',
-      ],
-      'sources': [
-        '<(DEPTH)/media/cast/test/utility/udp_proxy_main.cc',
-      ],
-    },
-  ],
-}
diff --git a/media/cast/transport/cast_transport.gyp b/media/cast/transport/cast_transport.gyp
deleted file mode 100644
index 434658e..0000000
--- a/media/cast/transport/cast_transport.gyp
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 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': {
-    'include_tests%': 1,
-    'chromium_code': 1,
-  },
-  'targets': [
-    {
-      'target_name': 'cast_transport',
-      'type': 'static_library',
-      'include_dirs': [
-        '<(DEPTH)/',
-      ],
-      'dependencies': [
-        '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/media/cast/logging/logging.gyp:cast_common_logging',
-        '<(DEPTH)/net/net.gyp:net',
-        'utility/utility.gyp:transport_utility',
-      ],
-      'sources': [
-        'cast_transport_config.cc',
-        'cast_transport_config.h',
-        'cast_transport_defines.h',
-        'cast_transport_sender.h',
-        'cast_transport_sender_impl.cc',
-        'cast_transport_sender_impl.h',
-        'pacing/paced_sender.cc',
-        'pacing/paced_sender.h',
-        'rtcp/rtcp_builder.cc',
-        'rtcp/rtcp_builder.h',
-        'rtp_sender/packet_storage/packet_storage.cc',
-        'rtp_sender/packet_storage/packet_storage.h',
-        'rtp_sender/rtp_packetizer/rtp_packetizer.cc',
-        'rtp_sender/rtp_packetizer/rtp_packetizer.h',
-        'rtp_sender/rtp_sender.cc',
-        'rtp_sender/rtp_sender.h',
-        'transport/udp_transport.cc',
-        'transport/udp_transport.h',
-        'transport_audio_sender.cc',
-        'transport_audio_sender.h',
-        'transport_video_sender.cc',
-        'transport_video_sender.h',
-      ], # source
-    },
-  ],  # targets,
-}
diff --git a/media/cast/transport/utility/utility.gyp b/media/cast/transport/utility/utility.gyp
deleted file mode 100644
index 9be4068..0000000
--- a/media/cast/transport/utility/utility.gyp
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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.
-
-{
-  'variables': {
-    'chromium_code': 1,
-  },
-  'targets': [
-    {
-      'target_name': 'transport_utility',
-      'type': 'static_library',
-      'include_dirs': [
-         '<(DEPTH)/',
-      ],
-      'dependencies': [
-        '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/crypto/crypto.gyp:crypto',
-      ],
-      'sources': [
-        'transport_encryption_handler.cc',
-        'transport_encryption_handler.h',
-      ],
-    },
-  ],
-}
diff --git a/media/cast/video_receiver/video_receiver.gypi b/media/cast/video_receiver/video_receiver.gypi
deleted file mode 100644
index e741719..0000000
--- a/media/cast/video_receiver/video_receiver.gypi
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2013 The Chromium Authors. All rights reserved.
-# Use of the source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
-  'targets': [
-    {
-      'target_name': 'cast_video_receiver',
-      'type': 'static_library',
-      'include_dirs': [
-         '<(DEPTH)/',
-         '<(DEPTH)/third_party/',
-         '<(DEPTH)/third_party/webrtc',
-      ],
-      'sources': [
-        'video_decoder.h',
-        'video_decoder.cc',
-        'video_receiver.h',
-        'video_receiver.cc',
-      ], # source
-      'dependencies': [
-        '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/media/cast/framer/framer.gyp:cast_framer',
-        '<(DEPTH)/media/cast/rtp_receiver/rtp_receiver.gyp:cast_rtp_receiver',
-        '<(DEPTH)/media/cast/transport/utility/utility.gyp:transport_utility',
-        '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx',
-      ],
-    },
-  ],
-}
-
-
diff --git a/media/cast/video_sender/codecs/vp8/vp8_encoder.gypi b/media/cast/video_sender/codecs/vp8/vp8_encoder.gypi
deleted file mode 100644
index 4a1a536..0000000
--- a/media/cast/video_sender/codecs/vp8/vp8_encoder.gypi
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 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.
-
-{
-  'targets': [
-    {
-      'target_name': 'cast_vp8_encoder',
-      'type': 'static_library',
-      'include_dirs': [
-         '<(DEPTH)/',
-         '<(DEPTH)/third_party/',
-      ],
-      'sources': [
-        'vp8_encoder.cc',
-        'vp8_encoder.h',
-      ], # source
-      'dependencies': [
-        '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
-        '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
-        '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx',
-      ],
-    },
-  ],
-}
diff --git a/media/cast/video_sender/video_sender.gypi b/media/cast/video_sender/video_sender.gypi
deleted file mode 100644
index 6e12615..0000000
--- a/media/cast/video_sender/video_sender.gypi
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 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.
-
-{
-  'includes': [
-    'codecs/vp8/vp8_encoder.gypi',
-  ],
-  'targets': [
-    {
-      'target_name': 'video_sender',
-      'type': 'static_library',
-      'include_dirs': [
-         '<(DEPTH)/',
-      ],
-      'sources': [
-        'external_video_encoder.h',
-        'external_video_encoder.cc',
-        'fake_software_video_encoder.h',
-        'fake_software_video_encoder.cc',
-        'software_video_encoder.h',
-        'video_encoder.h',
-        'video_encoder_impl.h',
-        'video_encoder_impl.cc',
-        'video_sender.h',
-        'video_sender.cc',
-      ], # source
-      'dependencies': [
-        '<(DEPTH)/media/cast/rtcp/rtcp.gyp:*',
-        '<(DEPTH)/media/cast/transport/cast_transport.gyp:cast_transport',
-        '<(DEPTH)/media/media.gyp:media',
-        '<(DEPTH)/media/media.gyp:shared_memory_support',
-        'congestion_control',
-        'cast_vp8_encoder',
-      ],
-    },
-  ],
-}
diff --git a/tools/ipc_fuzzer/message_lib/message_lib.gyp b/tools/ipc_fuzzer/message_lib/message_lib.gyp
index ed2527d..ae8a801 100644
--- a/tools/ipc_fuzzer/message_lib/message_lib.gyp
+++ b/tools/ipc_fuzzer/message_lib/message_lib.gyp
@@ -14,7 +14,7 @@
         '../../../base/base.gyp:base',
         '../../../chrome/chrome.gyp:common',
         '../../../ipc/ipc.gyp:ipc',
-        '../../../media/cast/transport/cast_transport.gyp:cast_transport',
+        '../../../media/cast/cast.gyp:cast_transport',
         '../../../skia/skia.gyp:skia',
         '../../../third_party/libjingle/libjingle.gyp:libjingle',
         '../../../ui/accessibility/accessibility.gyp:ax_gen',
diff --git a/tools/ipc_fuzzer/mutate/mutate.gyp b/tools/ipc_fuzzer/mutate/mutate.gyp
index 2dbe6e6..7b13599 100644
--- a/tools/ipc_fuzzer/mutate/mutate.gyp
+++ b/tools/ipc_fuzzer/mutate/mutate.gyp
@@ -14,7 +14,7 @@
         '../../../base/base.gyp:base',
         '../../../chrome/chrome.gyp:common',
         '../../../ipc/ipc.gyp:ipc',
-        '../../../media/cast/transport/cast_transport.gyp:cast_transport',
+        '../../../media/cast/cast.gyp:cast_transport',
         '../../../ppapi/ppapi_internal.gyp:ppapi_ipc',
         '../../../skia/skia.gyp:skia',
         '../../../third_party/libjingle/libjingle.gyp:libjingle',
@@ -41,7 +41,7 @@
         '../../../base/base.gyp:base',
         '../../../chrome/chrome.gyp:common',
         '../../../ipc/ipc.gyp:ipc',
-        '../../../media/cast/transport/cast_transport.gyp:cast_transport',
+        '../../../media/cast/cast.gyp:cast_transport',
         '../../../ppapi/ppapi_internal.gyp:ppapi_ipc',
         '../../../skia/skia.gyp:skia',
         '../../../third_party/libjingle/libjingle.gyp:libjingle',
diff --git a/tools/ipc_fuzzer/replay/replay.gyp b/tools/ipc_fuzzer/replay/replay.gyp
index 1a46f9f..ae47cc8 100644
--- a/tools/ipc_fuzzer/replay/replay.gyp
+++ b/tools/ipc_fuzzer/replay/replay.gyp
@@ -15,7 +15,7 @@
         '../../../base/base.gyp:base',
         '../../../chrome/chrome.gyp:common',
         '../../../ipc/ipc.gyp:ipc',
-        '../../../media/cast/transport/cast_transport.gyp:cast_transport',
+        '../../../media/cast/cast.gyp:cast_transport',
       ],
       'sources': [
         'replay.cc',