Reland: Move VideoCapture* files from media/base/android/... to media/capture/video/android/java/...

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 97 matching lines @@
     "capture/content/feedback_signal_accumulator.cc",
     "capture/content/feedback_signal_accumulator.h",
     "capture/content/screen_capture_device_core.cc",
     "capture/content/screen_capture_device_core.h",
     "capture/content/smooth_event_sampler.cc",
     "capture/content/smooth_event_sampler.h",
     "capture/content/thread_safe_capture_oracle.cc",
     "capture/content/thread_safe_capture_oracle.h",
     "capture/content/video_capture_oracle.cc",
     "capture/content/video_capture_oracle.h",
+    "capture/video/android/video_capture_device_android.cc",
+    "capture/video/android/video_capture_device_android.h",
+    "capture/video/android/video_capture_device_factory_android.cc",
+    "capture/video/android/video_capture_device_factory_android.h",
     "capture/video/fake_video_capture_device.cc",
     "capture/video/fake_video_capture_device.h",
     "capture/video/fake_video_capture_device_factory.cc",
     "capture/video/fake_video_capture_device_factory.h",
     "capture/video/file_video_capture_device.cc",
     "capture/video/file_video_capture_device.h",
     "capture/video/file_video_capture_device_factory.cc",
     "capture/video/file_video_capture_device_factory.h",
     "capture/video/linux/v4l2_capture_delegate.cc",
     "capture/video/linux/v4l2_capture_delegate.h",
@@ skipping 252 matching lines @@
   if (is_android) {
     # On Android, FFmpeg is built without video decoders. We only
     # support hardware video decoding.
     if (media_use_ffmpeg) {
       sources -= [
         "filters/ffmpeg_video_decoder.cc",
         "filters/ffmpeg_video_decoder.h",
       ]
     }
     sources += [
-      "capture/video/android/video_capture_device_android.cc",
-      "capture/video/android/video_capture_device_android.h",
-      "capture/video/android/video_capture_device_factory_android.cc",
-      "capture/video/android/video_capture_device_factory_android.h",
       "filters/android/media_codec_audio_decoder.cc",
       "filters/android/media_codec_audio_decoder.h",
     ]
     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/base/android:video_capture_jni_headers",
+      "//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 153 matching lines @@
   }
 
   public_deps = [
     ":media_features",
     ":shared_memory_support",
     "//media/audio",
     "//media/base",
     "//third_party/opus",
   ]
 
+  # TODO(mcasas) Remove this after http://crbug.com/584797
+  if (is_android) {
+    public_deps += [ "//media/capture/video/android" ]
+  }
+
   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/common",
     "//skia",
     "//third_party/libwebm",
     "//third_party/libyuv",
@@ skipping 124 matching lines @@
 
   if (is_android) {
     isolate_file = "media_unittests.isolate"
     sources -= [
       "filters/decrypting_audio_decoder_unittest.cc",
       "filters/decrypting_video_decoder_unittest.cc",
     ]
     deps += [
       "//media/base/android:media_java",
       "//media/base/android:unittests",
+      "//media/capture/video/android:capture_java",
       "//ui/android:ui_java",
     ]
   }
 
   # If ExternalClearKey is built, we can test CdmAdapter.
   if (enable_pepper_cdms) {
     sources += [ "cdm/cdm_adapter_unittest.cc" ]
     data_deps += [ "//media/cdm/ppapi:clearkeycdm" ]
   }
 
@@ skipping 200 matching lines @@
 if (proprietary_codecs) {
   fuzzer_test("media_cenc_utils_fuzzer") {
     sources = [
       "cdm/cenc_utils_fuzzertest.cc",
     ]
     deps = [
       ":media",
     ]
   }
 }