Revert of Extract media/capture/capture_unittests from media_unittests

media/media.gyp

 # Copyright (c) 2012 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,
     # Override to dynamically link the cras (ChromeOS audio) library.
     'use_cras%': 0,
     # Option e.g. for Linux distributions to link pulseaudio directly
@@ skipping 1057 matching lines @@
       'dependencies': [
         '../base/base.gyp:base',
       ]
     },
     {
       # GN version: //media:media_unittests
       'target_name': 'media_unittests',
       'type': '<(gtest_target_type)',
       'dependencies': [
         'audio_test_config',
+        # TODO(mcasas): Remove this entry after https://crbug.com/618718.
+        'capture/capture.gyp:unittests',
         'cdm_paths',
         'media',
         'media_features',
         'media_test_support',
         'shared_memory_support',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_base',
         '../gpu/gpu.gyp:command_buffer_common',
         '../gpu/gpu.gyp:gpu_unittest_utils',
@@ skipping 403 matching lines @@
       },
     },
     {
       # GN version: //media:audio_unittests
       # For running the subset of tests that might require audio
       # hardware separately on GPU bots. media_unittests includes these too.
       'target_name': 'audio_unittests',
       'type': '<(gtest_target_type)',
       'dependencies': [
         'audio_test_config',
+        # TODO(mcasas): Remove this entry after https://crbug.com/618718.
+        'capture/capture.gyp:unittests',
         'media_test_support',
         '../base/base.gyp:test_support_base',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../ui/gfx/gfx.gyp:gfx_test_support',
         '../url/url.gyp:url_lib',
       ],
       'sources': [
         'base/run_all_unittests.cc',
       ],
@@ skipping 335 matching lines @@
             'base/android/media_task_runner.cc',
             'base/android/media_task_runner.h',
             'base/android/media_url_interceptor.h',
             'base/android/provision_fetcher.h',
             'base/android/sdk_media_codec_bridge.cc',
             'base/android/sdk_media_codec_bridge.h',
             'base/android/video_decoder_job.cc',
             'base/android/video_decoder_job.h',
             'base/android/video_media_codec_decoder.cc',
             'base/android/video_media_codec_decoder.h',
+            'capture/video/android/capture_jni_registrar.cc',
+            'capture/video/android/capture_jni_registrar.h',
           ],
           'conditions': [
             # Only 64 bit builds are using android-21 NDK library, check common.gypi
             ['target_arch=="arm64" or target_arch=="x64" or target_arch=="mips64el"', {
               'sources': [
                 'base/android/ndk_media_codec_bridge.cc',
                 'base/android/ndk_media_codec_bridge.h',
                 'base/android/ndk_media_codec_wrapper.cc',
               ],
             }],
@@ skipping 396 matching lines @@
                 'dependencies': [
                   '../build/linux/system.gyp:libdrm',
                 ]
               }],
             ],
           }
         ]
     }],
   ],
 }