Revert of Re-Reland: Make media/capture gn and gyps produce components (patchset #2 id:20001 of htt…

media/BUILD.gn

Index: media/BUILD.gn
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 99b66f6e76eabe0b260bc6de5302f7307d1b174e..fb4c400312c297392e4ecbd38cb6fc9f2cf3c35e 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -337,6 +337,8 @@ component("media") {
     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
@@ -360,11 +362,6 @@ component("media") {
 
   if (is_mac) {
     public_deps += [ "//media/base/mac" ]
-    libs += [
-      "CoreFoundation.framework",
-      "CoreGraphics.framework",
-      "Foundation.framework",
-    ]
   }
 
   if (is_ios) {
@@ -373,6 +370,12 @@ component("media") {
 
   if (is_win) {
     deps += [ "//media/base/win" ]
+    libs += [
+      "mf.lib",
+      "mfplat.lib",
+      "mfreadwrite.lib",
+      "mfuuid.lib",
+    ]
   }
 
   if (proprietary_codecs) {
@@ -459,6 +462,7 @@ component("media") {
     ":shared_memory_support",
     "//media/audio",
     "//media/base",
+    "//media/capture",
     "//third_party/opus",
   ]
 
@@ -593,8 +597,6 @@ test("media_unittests") {
     "//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.