RELAND: Merge VideoSenderConfig and AudioSenderConfig.

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.
 
 {
   'includes': [ 'cast_testing_tools.gypi' ],
   'targets': [
     {
       # GN version: //media/cast:test_support
       'target_name': 'cast_test_utility',
@@ skipping 124 matching lines @@
         'test/end2end_unittest.cc',
         'test/utility/audio_utility_unittest.cc',
         'test/utility/barcode_unittest.cc',
       ], # sources
       'conditions': [
         ['OS=="android"', {
           'dependencies': [
             '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
           ],
         }],
+        ['OS=="ios" or OS=="mac"', {
+          'sources': [
+            'sender/h264_vt_encoder_unittest.cc',
+          ],
+
+          'dependencies': [
+            '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
+          ],
+        }] # OS=="ios" or OS=="mac"
       ], # conditions
     },
   ], # targets
   'conditions': [
-    ['OS=="ios" or OS=="mac"', {
-      'targets': [
-        {
-          # GN version: //media/cast:cast_h264_vt_encoder_unittests
-          # TODO(miu): This can be rolled into cast_unittests now that FFMPEG
-          # dependency issues are resolved for iOS; but there are bot/isolates
-          # to update too.
-          'target_name': 'cast_h264_vt_encoder_unittests',
-          'type': '<(gtest_target_type)',
-          'include_dirs': [
-            '<(DEPTH)/',
-          ],
-          'dependencies': [
-            'cast_common',
-            'cast_sender',
-            'cast_test_utility',
-            '<(DEPTH)/testing/gmock.gyp:gmock',
-            '<(DEPTH)/testing/gtest.gyp:gtest',
-            '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
-          ],
-          'sources': [
-            'sender/h264_vt_encoder_unittest.cc',
-          ],
-      }], # targets
-    }], # OS=="ios" or OS=="mac"
     ['OS=="android"', {
       'targets': [
         {
           'target_name': 'cast_unittests_apk',
           'type': 'none',
           'dependencies': [
             'cast_unittests',
           ],
           'variables': {
             'test_suite_name': 'cast_unittests',
@@ skipping 24 matching lines @@
                   '<(DEPTH)/tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
                 ],
               }
             ],
           ],
         },
       ],
     }], # test_isolation_mode != "noop"
   ], # conditions
 }