Revert of Make media/capture gn and gyps produce components

media/capture/BUILD.gn

Index: media/capture/BUILD.gn
diff --git a/media/capture/BUILD.gn b/media/capture/BUILD.gn
index dd7f0cf5d6ee9f1fe63cd0dc025fdc402f4cbc8f..04aa44d0539f1d28404045a933f49778fe8ee184 100644
--- a/media/capture/BUILD.gn
+++ b/media/capture/BUILD.gn
@@ -6,10 +6,8 @@
 import("//media/media_options.gni")
 import("//testing/test.gni")
 
-component("capture") {
-  defines = [ "CAPTURE_IMPLEMENTATION" ]
+source_set("capture") {
   sources = [
-    "capture_export.h",
     "content/animated_content_sampler.cc",
     "content/animated_content_sampler.h",
     "content/capture_resolution_chooser.cc",
@@ -27,6 +25,10 @@
     "device_monitor_mac.mm",
     "system_message_window_win.cc",
     "system_message_window_win.h",
+    "video/android/video_capture_device_android.cc",
+    "video/android/video_capture_device_android.h",
+    "video/android/video_capture_device_factory_android.cc",
+    "video/android/video_capture_device_factory_android.h",
     "video/fake_video_capture_device.cc",
     "video/fake_video_capture_device.h",
     "video/fake_video_capture_device_factory.cc",
@@ -79,18 +81,12 @@
   public_deps = []
   deps = [
     "//base",
-    "//base:i18n",
-    "//media",
+    "//media/base",
     "//skia",
     "//ui/display",
-    "//ui/gfx",
   ]
 
   configs += [
-    # TODO(mcasas): media/base should be a component and not a source_set, but
-    # it depends on parts of media/filters, media/ffmpeg etc. Until then, we
-    # pretend to be inside media.dll and duplicate the few symbols needed, see
-    # https://crbug.com/590017.
     "//media:media_implementation",
 
     # TODO(mcasas): Fix size_t to int truncation warning-treated-as-errors.
@@ -98,10 +94,7 @@
   ]
 
   if (is_android) {
-    public_deps += [
-      "video/android",
-      "video/android:capture_java",
-    ]
+    public_deps += [ "video/android" ]
     deps += [ "video/android:capture_jni_headers" ]
   }
 
@@ -123,16 +116,14 @@
   }
 
   if (is_win) {
-    deps += [
-      "//media/base",  # For media_switches.
-      "//media/base/win",
-    ]
+    public_deps += [ "//media/base/win" ]
     libs = [
       "mf.lib",
       "mfplat.lib",
       "mfreadwrite.lib",
       "mfuuid.lib",
     ]
+
     ldflags = [
       "/DELAYLOAD:mf.dll",
       "/DELAYLOAD:mfplat.dll",
@@ -141,7 +132,6 @@
   }
 }
 
-# TODO(mcasas): Make this a test target, https://crbug.com/618718.
 source_set("unittests") {
   testonly = true
 
@@ -158,7 +148,7 @@
   ]
 
   deps = [
-    ":capture",
+    "//media/base:unittests",
     "//testing/gmock",
     "//testing/gtest",
   ]