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

content/shell/android/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/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build_overrides/v8.gni")
 import("//third_party/icu/config.gni")
 
 generate_jni("content_shell_jni_headers") {
@@ skipping 28 matching lines @@
   custom_package = "org.chromium.content_shell"
 }
 
 android_library("content_shell_java") {
   testonly = true
   deps = [
     ":content_shell_java_resources",
     "//base:base_java",
     "//content/public/android:content_java",
     "//media/base/android:media_java",
+    "//media/capture/video/android:capture_java",
     "//mojo/public/java:system",
     "//net/android:net_java",
     "//ui/android:ui_java",
   ]
   DEPRECATED_java_in_dir = "java/src"
 }
 
 content_shell_manifest =
     "$target_gen_dir/content_shell_manifest/AndroidManifest.xml"
 
@@ skipping 13 matching lines @@
   android_manifest = content_shell_manifest
 }
 
 android_library("content_shell_apk_java") {
   testonly = true
   deps = [
     ":content_shell_apk_resources",
     ":content_shell_java",
     "//base:base_java",
     "//content/public/android:content_java",
-    "//media/base/android:media_java",
+    "//media/capture/video/android:capture_java",
     "//net/android:net_java",
     "//ui/android:ui_java",
   ]
   DEPRECATED_java_in_dir = "shell_apk/src"
 }
 
 android_assets("content_shell_assets") {
   sources = [
     "$root_out_dir/content_shell.pak",
   ]
   disable_compression = true
   deps = [
     "//content/shell:pak",
     "//third_party/icu:icu_assets",
     "//v8:v8_external_startup_data_assets",
   ]
 }
 
 android_apk("content_shell_apk") {
   testonly = true
   deps = [
     ":content_shell_apk_java",
     ":content_shell_apk_resources",
     ":content_shell_assets",
     ":content_shell_java",
     ":content_shell_manifest",
     ":libcontent_shell_content_view",
     "//base:base_java",
     "//content/public/android:content_java",
-    "//media/base/android:media_java",
+    "//media/capture/video/android:capture_java",
     "//net/android:net_java",
     "//third_party/mesa:osmesa",
     "//ui/android:ui_java",
   ]
   apk_name = "ContentShell"
   android_manifest = content_shell_manifest
   native_libs = [ "libcontent_shell_content_view.so" ]
   loadable_modules = [ "$root_out_dir/libosmesa.so" ]
 }
 
@@ skipping 101 matching lines @@
   testonly = true
   deps = [
     ":content_shell_java",
     "//base:base_java",
     "//content/public/android:content_java",
     "//testing/android/native_test:native_test_java",
     "//ui/android:ui_java",
   ]
   DEPRECATED_java_in_dir = "browsertests/src"
 }