Revert of Created new target unit_tests in //media/formats.

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 467 matching lines @@
     "filters/source_buffer_state_unittest.cc",
     "filters/source_buffer_stream_unittest.cc",
     "filters/video_cadence_estimator_unittest.cc",
     "filters/video_decoder_selector_unittest.cc",
     "filters/video_frame_stream_unittest.cc",
     "filters/video_renderer_algorithm_unittest.cc",
     "filters/vp8_bool_decoder_unittest.cc",
     "filters/vp8_parser_unittest.cc",
     "filters/vp9_parser_unittest.cc",
     "filters/vp9_raw_bits_reader_unittest.cc",
+    "formats/ac3/ac3_util_unittest.cc",
+    "formats/common/offset_byte_queue_unittest.cc",
+    "formats/webm/cluster_builder.cc",
+    "formats/webm/cluster_builder.h",
+    "formats/webm/opus_packet_builder.cc",
+    "formats/webm/opus_packet_builder.h",
+    "formats/webm/tracks_builder.cc",
+    "formats/webm/tracks_builder.h",
+    "formats/webm/webm_cluster_parser_unittest.cc",
+    "formats/webm/webm_content_encodings_client_unittest.cc",
+    "formats/webm/webm_crypto_helpers_unittest.cc",
+    "formats/webm/webm_parser_unittest.cc",
+    "formats/webm/webm_stream_parser_unittest.cc",
+    "formats/webm/webm_tracks_parser_unittest.cc",
+    "formats/webm/webm_webvtt_parser_unittest.cc",
     "muxers/webm_muxer_unittest.cc",
     "renderers/audio_renderer_impl_unittest.cc",
     "renderers/renderer_impl_unittest.cc",
     "renderers/skcanvas_video_renderer_unittest.cc",
     "renderers/video_renderer_impl_unittest.cc",
     "video/gpu_memory_buffer_video_frame_pool_unittest.cc",
     "video/h264_poc_unittest.cc",
     "video/half_float_maker_unittest.cc",
   ]
 
   data = [
     "test/data/",
   ]
 
   # TODO(wolenetz): Fix size_t to int truncation in win64.
   # See http://crbug.com/171009
   configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 
   deps = [
     ":cdm_api",
     ":cdm_paths",
     ":media",
     ":test_support",
     "//base/test:test_support",
     "//crypto",
     "//gpu:test_support",
     "//gpu/command_buffer/common",
     "//media/audio:test_support",
     "//media/base:test_support",
-    "//media/formats:unit_tests",
     "//ppapi/features",
     "//skia",  # Direct dependency required to inherit config.
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/libwebm",
     "//third_party/libyuv",
     "//third_party/widevine/cdm:headers",
     "//ui/gfx:test_support",
     "//url",
   ]
@@ skipping 37 matching lines @@
       # FFmpeg on Android does not include video decoders.
       sources += [ "filters/ffmpeg_video_decoder_unittest.cc" ]
     }
   }
 
   if (current_cpu != "arm" && is_chromeos) {
     sources += [ "filters/h264_bitstream_buffer_unittest.cc" ]
   }
 
   if (proprietary_codecs) {
+    sources += [
+      "cdm/cenc_utils_unittest.cc",
+      "filters/h264_to_annex_b_bitstream_converter_unittest.cc",
+      "formats/common/stream_parser_test_base.cc",
+      "formats/common/stream_parser_test_base.h",
+      "formats/mp4/aac_unittest.cc",
+      "formats/mp4/avc_unittest.cc",
+      "formats/mp4/box_reader_unittest.cc",
+      "formats/mp4/es_descriptor_unittest.cc",
+      "formats/mp4/mp4_stream_parser_unittest.cc",
+      "formats/mp4/sample_to_group_iterator_unittest.cc",
+      "formats/mp4/track_run_iterator_unittest.cc",
+      "formats/mpeg/adts_stream_parser_unittest.cc",
+      "formats/mpeg/mpeg1_audio_stream_parser_unittest.cc",
+    ]
+    if (enable_mse_mpeg2ts_stream_parser) {
+      sources += [
+        "formats/mp2t/es_adapter_video_unittest.cc",
+        "formats/mp2t/es_parser_adts_unittest.cc",
+        "formats/mp2t/es_parser_h264_unittest.cc",
+        "formats/mp2t/es_parser_mpeg1audio_unittest.cc",
+        "formats/mp2t/es_parser_test_base.cc",
+        "formats/mp2t/es_parser_test_base.h",
+        "formats/mp2t/mp2t_stream_parser_unittest.cc",
+        "formats/mp2t/timestamp_unroller_unittest.cc",
+      ]
+    }
     if (media_use_ffmpeg) {
       sources += [
         "filters/ffmpeg_aac_bitstream_converter_unittest.cc",
         "filters/ffmpeg_h264_to_annex_b_bitstream_converter_unittest.cc",
       ]
     }
     if (enable_hevc_demuxing) {
       sources += [ "filters/h265_parser_unittest.cc" ]
     }
     if (enable_hls_sample_aes) {
       deps += [ "//third_party/boringssl" ]
     }
+    if (enable_dolby_vision_demuxing) {
+      sources += [ "formats/mp4/dolby_vision_unittest.cc" ]
+    }
   }
 
   if (is_mac || is_ios) {
     libs = [
       "AppKit.framework",
       "Foundation.framework",
     ]
   }
 
   configs += [ ":media_config" ]
@@ skipping 252 matching lines @@
   fuzzer_test("media_mp4_avcc_parser_fuzzer") {
     sources = [
       "formats/mp4/mp4_avcc_parser_fuzzer.cc",
     ]
     deps = [
       ":media",
       "//base",
     ]
   }
 }