Revert of Extract media/capture/capture_unittests from media_unittests

media/capture/capture.gyp

 # Copyright 2016 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,
     'capture_sources': [
       'capture_export.h',
       'content/animated_content_sampler.cc',
@@ skipping 111 matching lines @@
       'include_dirs': [
         '<(DEPTH)/',
       ],
       'sources': [
         '<@(capture_sources)'
       ],
       'conditions': [
         ['OS=="android"', {
           'dependencies': [
             'capture_java',
-            '<(DEPTH)/media/capture/video/android'
           ],
         }],
         ['OS=="mac"', {
           'dependencies': [
             '<(DEPTH)/third_party/decklink/decklink.gyp:decklink',
           ],
         }],
         ['chromeos==1', {
           'dependencies': [
             '<(DEPTH)/ui/display/display.gyp:display',
           ],
         }],
         ['OS=="linux" and use_udev==1', {
           'dependencies': [
             '<(DEPTH)/device/udev_linux/udev.gyp:udev_linux',
           ],
         }],
         ['OS=="win"', {
           'dependencies': [
             '<(DEPTH)/media/media.gyp:mf_initializer',
           ],
           # TODO(jschuh): http://crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [ 4267, ],
         }],
       ],
     },
 
     {
-      # GN version: //media/capture:capture_unittests
-      'target_name': 'capture_unittests',
-      'type': '<(gtest_target_type)',
-      'include_dirs': [
-        '<(DEPTH)/',
-      ],
+      # GN version: //media/capture:unittests source_set
+      'target_name': 'unittests',
+      'type': 'none',
       'dependencies': [
         'capture',
-        '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/base/base.gyp:run_all_unittests',
-        '<(DEPTH)/media/media.gyp:media',
-        '<(DEPTH)/testing/gmock.gyp:gmock',
-        '<(DEPTH)/testing/gtest.gyp:gtest',
-        '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
-        '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
-        '<(DEPTH)/ui/gfx/gfx.gyp:gfx_test_support',
       ],
-      'sources': [
-        '<@(capture_unittests_sources)'
-      ],
-      'conditions': [
-        ['OS=="android"', {
-          'dependencies': [
-            '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
-          ],
-        }],
-        ['OS=="win"', {
-          'dependencies': [
-            '<(DEPTH)/media/media.gyp:mf_initializer',
-          ],
-          # TODO(jschuh): http://crbug.com/167187 fix size_t to int truncations.
-          'msvs_disabled_warnings': [ 4267, ],
-        }],
-      ], # conditions
+      'direct_dependent_settings': {
+        'sources': [
+          '<@(capture_unittests_sources)'
+        ],
+      },
     },
   ],
 
   'conditions': [
-
-    ['test_isolation_mode != "noop"', {
-      'targets': [
-        {
-          # There's no GN equivalent to this.
-          'target_name': 'capture_unittests_run',
-          'type': 'none',
-          'dependencies': [
-            'capture_unittests',
-          ],
-          'includes': [
-            '../../build/isolate.gypi',
-          ],
-          'sources': [
-            'capture_unittests.isolate',
-          ]
-        }
-      ]
-    }],
-
     ['OS=="android"', {
       'targets': [
         {
           'target_name': 'capture_java',
           'type': 'none',
           'dependencies': [
             '/base/base.gyp:base',
             'media_android_captureapitype',
             'media_android_imageformat',
             'video_capture_android_jni_headers',
@@ skipping 27 matching lines @@
           'type': 'none',
           'sources': [
             'video/android/java/src/org/chromium/media/VideoCapture.java',
             'video/android/java/src/org/chromium/media/VideoCaptureFactory.java',
           ],
           'variables': {
            'jni_gen_package': 'media',
           },
          'includes': ['../../build/jni_generator.gypi'],
         },
-
-        {
-          # There's no GN equivalent to this.
-          'target_name': 'capture_unittests_apk',
-          'type': 'none',
-          'dependencies': [
-            'capture_java',
-            'capture_unittests',
-          ],
-          'variables': {
-            'test_suite_name': 'capture_unittests',
-          },
-          'includes': ['../../build/apk_test.gypi'],
-        },
       ],
-      'conditions': [
-        ['test_isolation_mode != "noop"', {
-          'targets': [
-            {
-              'target_name': 'capture_unittests_apk_run',
-              'type': 'none',
-              'dependencies': [
-                'capture_unittests_apk',
-              ],
-              'includes': [
-                '../../build/isolate.gypi',
-              ],
-              'sources': [
-                'capture_unittests_apk.isolate',
-              ],
-            },
-          ],
-        }],
-      ],
-
     }],
-
   ],
 }