Revert of Make media/capture gn and gyps produce components

media/BUILD.gn

 # 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.
 
 import("//build/buildflag_header.gni")
 import("//build/config/android/config.gni")
 import("//build/config/arm.gni")
 import("//build/config/features.gni")
 import("//build/config/linux/pkg_config.gni")
 import("//build/config/ui.gni")
@@ skipping 320 matching lines @@
     ]
     sources -= [
       "filters/decrypting_audio_decoder.cc",
       "filters/decrypting_audio_decoder.h",
       "filters/decrypting_video_decoder.cc",
       "filters/decrypting_video_decoder.h",
     ]
     deps += [
       "//media/base/android",
       "//media/base/android:media_jni_headers",
+      "//media/capture/video/android:capture_java",
+      "//media/capture/video/android:capture_jni_headers",
     ]
 
     # Only 64 bit builds are using android-21 NDK library, check common.gypi
     if (current_cpu == "arm64" || current_cpu == "x64" ||
         current_cpu == "mips64el") {
       sources += [
         "base/android/ndk_media_codec_bridge.cc",
         "base/android/ndk_media_codec_bridge.h",
         "base/android/ndk_media_codec_wrapper.cc",
       ]
@@ skipping 11 matching lines @@
   if (is_mac) {
     public_deps += [ "//media/base/mac" ]
   }
 
   if (is_ios) {
     deps += [ "//media/base/mac" ]
   }
 
   if (is_win) {
     deps += [ "//media/base/win" ]
+    libs += [
+      "mf.lib",
+      "mfplat.lib",
+      "mfreadwrite.lib",
+      "mfuuid.lib",
+    ]
   }
 
   if (proprietary_codecs) {
     sources += [
       "cdm/cenc_utils.cc",
       "cdm/cenc_utils.h",
       "filters/h264_to_annex_b_bitstream_converter.cc",
       "filters/h264_to_annex_b_bitstream_converter.h",
       "formats/mp4/aac.cc",
       "formats/mp4/aac.h",
@@ skipping 66 matching lines @@
       "filters/source_buffer_platform.cc",
       "filters/source_buffer_platform.h",
     ]
   }
 
   public_deps += [
     ":media_features",
     ":shared_memory_support",
     "//media/audio",
     "//media/base",
+    "//media/capture",
     "//third_party/opus",
   ]
 
   deps += [
     "//base",
     "//base:i18n",
     "//base/third_party/dynamic_annotations",
     "//crypto",
     "//crypto:platform",  # TODO(ajwong): This used to be provided by crypto.gyp via export_dependent_settings
     "//gpu/command_buffer/client:gles2_interface",
@@ skipping 115 matching lines @@
     ":cdm_paths",
     ":media",
     ":test_support",
     "//base/test:test_support",
     "//gpu:test_support",
     "//gpu/command_buffer/common",
     "//media/audio:test_support",
     "//media/audio:unittests",
     "//media/base:test_support",
     "//media/base:unittests",
-
-    # TODO(mcasas): Remove the capture sources after https://crbug.com/618718.
     "//media/capture:unittests",
     "//media/test:pipeline_integration_tests",
     "//skia",  # Direct dependency required to inherit config.
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/libwebm",
     "//third_party/libyuv",
     "//third_party/widevine/cdm:version_h",
     "//ui/gfx:test_support",
     "//url",
@@ skipping 271 matching lines @@
   sources = [
     "filters/vpx_video_decoder_fuzzertest.cc",
   ]
   deps = [
     ":media",
     "//base",
   ]
   libfuzzer_options = [ "max_len = 400000" ]
   seed_corpus = "//media/test/data"
 }