Minor cleanups in media/s BUILD.gns and media/capture files

media/base/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/arm.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/config/linux/pkg_config.gni")
 import("//media/media_options.gni")
@@ skipping 386 matching lines @@
   configs += [ "//media:media_config" ]
   deps = [
     "//base",
     "//base/test:test_support",
     "//media",
     "//media:media_features",
     "//media:shared_memory_support",
     "//testing/gmock",
     "//ui/gfx:test_support",
   ]
-  if (is_android) {
-    deps += [
-      # Needed to register capture Java/Jni objects. TODO(mcasas): Remove when
-      # the dependency to capture is not needed, see https://crbug.com/618718.
-      "//media/capture",
-      "//media/capture/video/android",
-    ]
-  }
 }
 
 source_set("unittests") {
   testonly = true
   sources = [
     "audio_block_fifo_unittest.cc",
     "audio_buffer_converter_unittest.cc",
     "audio_buffer_queue_unittest.cc",
     "audio_buffer_unittest.cc",
     "audio_bus_unittest.cc",
@@ skipping 187 matching lines @@
 
 fuzzer_test("media_container_names_fuzzer") {
   sources = [
     "container_names_fuzzertest.cc",
   ]
   deps = [
     "//base",
     "//media",
   ]
 }