Revert 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 389 matching lines @@
     ]
     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/capture/video/android:media_java",
-      "//media/capture/video/android:video_capture_jni_headers",
+      "//media/base/android:video_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 295 matching lines @@
 
   data_deps = []
 
   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",
       "//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 201 matching lines @@
 if (proprietary_codecs) {
   fuzzer_test("media_cenc_utils_fuzzer") {
     sources = [
       "cdm/cenc_utils_fuzzertest.cc",
     ]
     deps = [
       ":media",
     ]
   }
 }