Fixup media/capture in preparation for gn check

Adds some missing DEPS and breaks out a target which capture/*/android
can depend on without creating a circular dependency.

BUG=613033
TEST=none

Change-Id: I00ce3456ca7460c9791ca4a16432279c415e4329
Reviewed-on: https://chromium-review.googlesource.com/622099
Reviewed-by: mark a. foltz <mfoltz@chromium.org>
Reviewed-by: Yuri Wiitala <miu@chromium.org>
Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#496183}

media/capture/BUILD.gn

@@ -34,7 +34,13 @@ component("capture_base") {
   ]
 }
 
-component("capture_lib") {
+# Target which allows breakout of Android BUILD.gn files.
+source_set("capture_device_specific") {
+  visibility = [
+    ":capture_lib",
+    "//media/capture/content/android",
+    "//media/capture/video/android",
+  ]
   defines = [ "CAPTURE_IMPLEMENTATION" ]
   sources = [
     "content/animated_content_sampler.cc",
@@ -57,6 +63,27 @@ component("capture_lib") {
     "video/file_video_capture_device.h",
     "video/file_video_capture_device_factory.cc",
     "video/file_video_capture_device_factory.h",
+    "video/video_capture_buffer_handle.h",
+    "video/video_capture_device.cc",
+    "video/video_capture_device.h",
+    "video/video_capture_device_factory.cc",
+    "video/video_capture_device_factory.h",
+  ]
+  public_deps = [
+    ":capture_base",
+  ]
+  deps = [
+    "//base",
+    "//base:i18n",
+    "//media",
+    "//media/capture/mojo:image_capture",
+    "//ui/gfx",
+  ]
+}
+
+component("capture_lib") {
+  defines = [ "CAPTURE_IMPLEMENTATION" ]
+  sources = [
     "video/linux/camera_config_chromeos.cc",
     "video/linux/camera_config_chromeos.h",
     "video/linux/v4l2_capture_delegate.cc",
@@ -79,20 +106,15 @@ component("capture_lib") {
     "video/shared_memory_buffer_handle.h",
     "video/shared_memory_buffer_tracker.cc",
     "video/shared_memory_buffer_tracker.h",
-    "video/video_capture_buffer_handle.h",
     "video/video_capture_buffer_pool.h",
     "video/video_capture_buffer_pool_impl.cc",
     "video/video_capture_buffer_pool_impl.h",
     "video/video_capture_buffer_tracker.h",
     "video/video_capture_buffer_tracker_factory.h",
     "video/video_capture_buffer_tracker_factory_impl.cc",
     "video/video_capture_buffer_tracker_factory_impl.h",
-    "video/video_capture_device.cc",
-    "video/video_capture_device.h",
     "video/video_capture_device_client.cc",
     "video/video_capture_device_client.h",
-    "video/video_capture_device_factory.cc",
-    "video/video_capture_device_factory.h",
     "video/video_capture_jpeg_decoder.h",
     "video/video_capture_system.h",
     "video/video_capture_system_impl.cc",
@@ -123,6 +145,7 @@ component("capture_lib") {
 
   public_deps = [
     ":capture_base",
+    ":capture_device_specific",
   ]
 
   deps = [
@@ -227,6 +250,7 @@ test("capture_unittests") {
     "//base/test:test_support",
     "//media:test_support",
     "//media/capture/mojo:image_capture",
+    "//mojo/edk/system",
     "//testing/gmock",
     "//testing/gtest",
     "//ui/gfx:test_support",

media/capture/content/android/BUILD.gn

@@ -20,6 +20,7 @@ source_set("android") {
   configs += [ "//media:media_config" ]
   deps = [
     ":screen_capture_jni_headers",
+    "//media/capture:capture_device_specific",
     "//media/capture/mojo:image_capture",
     "//third_party/libyuv",
     "//ui/gfx:color_space",

media/capture/ipc/BUILD.gn

@@ -15,6 +15,8 @@ source_set("ipc") {
   deps = [
     "//base",
     "//media",
+    "//media/base/ipc",
+    "//media/capture:capture_base",
     "//ui/gfx/ipc",
     "//ui/gfx/ipc/geometry",
     "//ui/gfx/ipc/skia",

media/capture/video/android/BUILD.gn

@@ -24,9 +24,11 @@ source_set("android") {
   configs += [ "//media:media_config" ]
   deps = [
     ":capture_jni_headers",
+    "//media/capture:capture_device_specific",
     "//media/capture/mojo:image_capture",
     "//third_party/libyuv",
     "//ui/gfx:color_space",
+    "//ui/gfx/geometry",
   ]
 }