Revert of Make media/capture gn and gyps produce components

media/capture/BUILD.gn

 # 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.
 
 import("//build/config/features.gni")
 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",
     "content/capture_resolution_chooser.h",
     "content/feedback_signal_accumulator.h",
     "content/screen_capture_device_core.cc",
     "content/screen_capture_device_core.h",
     "content/smooth_event_sampler.cc",
     "content/smooth_event_sampler.h",
     "content/thread_safe_capture_oracle.cc",
     "content/thread_safe_capture_oracle.h",
     "content/video_capture_oracle.cc",
     "content/video_capture_oracle.h",
     "device_monitor_mac.h",
     "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",
     "video/fake_video_capture_device_factory.h",
     "video/file_video_capture_device.cc",
     "video/file_video_capture_device.h",
     "video/file_video_capture_device_factory.cc",
     "video/file_video_capture_device_factory.h",
     "video/linux/v4l2_capture_delegate.cc",
     "video/linux/video_capture_device_chromeos.cc",
@@ skipping 32 matching lines @@
     "video/win/video_capture_device_factory_win.h",
     "video/win/video_capture_device_mf_win.cc",
     "video/win/video_capture_device_mf_win.h",
     "video/win/video_capture_device_win.cc",
     "video/win/video_capture_device_win.h",
   ]
 
   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.
     "//build/config/compiler:no_size_t_to_int_warning",
   ]
 
   if (is_android) {
-    public_deps += [
-      "video/android",
-      "video/android:capture_java",
-    ]
+    public_deps += [ "video/android" ]
     deps += [ "video/android:capture_jni_headers" ]
   }
 
   if (is_mac) {
     deps += [ "//third_party/decklink" ]
     libs = [
       "CoreFoundation.framework",
       "CoreGraphics.framework",
       "Foundation.framework",
     ]
   }
 
   if (use_udev) {
     deps += [ "//device/udev_linux" ]
     sources += [
       "device_monitor_udev.cc",
       "device_monitor_udev.h",
     ]
   }
 
   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",
       "/DELAYLOAD:mfreadwrite.dll",
     ]
   }
 }
 
-# TODO(mcasas): Make this a test target, https://crbug.com/618718.
 source_set("unittests") {
   testonly = true
 
   sources = [
     "content/animated_content_sampler_unittest.cc",
     "content/capture_resolution_chooser_unittest.cc",
     "content/feedback_signal_accumulator_unittest.cc",
     "content/smooth_event_sampler_unittest.cc",
     "content/video_capture_oracle_unittest.cc",
     "system_message_window_win_unittest.cc",
     "video/fake_video_capture_device_unittest.cc",
     "video/mac/video_capture_device_factory_mac_unittest.mm",
     "video/video_capture_device_unittest.cc",
   ]
 
   deps = [
-    ":capture",
+    "//media/base:unittests",
     "//testing/gmock",
     "//testing/gtest",
   ]
 
   # TODO(mcasas): Fix size_t to int truncation warning-treated-as-errors.
   configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 }