MSE: Relocate fuzzers from //testing/libfuzzer/fuzzers to //media/...

Many of the first fuzzers were implemented under //testing, including a
few MSE-related fuzzers. This change moves those MSE fuzzers closer to
the code they test under //media.

BUG=779238

Change-Id: Ied496bbaa78864e54d670cc549da46bdd09eeeb2
Reviewed-on: https://chromium-review.googlesource.com/742452
Commit-Queue: Max Moroz <mmoroz@chromium.org>
Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
Reviewed-by: Max Moroz <mmoroz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#512536}

media/BUILD.gn

@@ -376,4 +376,48 @@ if (proprietary_codecs) {
       "//base",
     ]
   }
+
+  fuzzer_test("media_mp4_box_reader_fuzzer") {
+    sources = [
+      "formats/mp4/mp4_box_reader_fuzzer.cc",
+    ]
+    deps = [
+      ":media",
+      "//base",
+    ]
+    libfuzzer_options = [ "max_len=500" ]
+    dict = "test/mp4.dict"
+  }
+}
+
+if (enable_mse_mpeg2ts_stream_parser) {
+  fuzzer_test("media_es_parser_adts_fuzzer") {
+    sources = [
+      "formats/mp2t/es_parser_adts_fuzzer.cc",
+    ]
+    deps = [
+      ":media",
+      "//base",
+    ]
+  }
+
+  fuzzer_test("media_es_parser_h264_fuzzer") {
+    sources = [
+      "formats/mp2t/es_parser_h264_fuzzer.cc",
+    ]
+    deps = [
+      ":media",
+      "//base",
+    ]
+  }
+
+  fuzzer_test("media_es_parser_mpeg1audio_fuzzer") {
+    sources = [
+      "formats/mp2t/es_parser_mpeg1audio_fuzzer.cc",
+    ]
+    deps = [
+      ":media",
+      "//base",
+    ]
+  }
 }

testing/libfuzzer/fuzzers/es_parser_mpeg1audio_fuzzer.cc → media/formats/mp2t/es_parser_mpeg1audio_fuzzer.cc

@@ -8,6 +8,7 @@
 #include <memory>
 
 #include "base/bind.h"
+#include "media/base/media_log.h"
 #include "media/formats/mp2t/es_parser_mpeg1audio.h"
 
 class NullMediaLog : public media::MediaLog {

testing/libfuzzer/fuzzers/mp4_box_reader_fuzzer.cc → media/formats/mp4/mp4_box_reader_fuzzer.cc

@@ -9,6 +9,7 @@
 
 #include "base/logging.h"
 #include "base/macros.h"
+#include "media/base/media_log.h"
 #include "media/formats/mp4/box_reader.h"
 
 class NullMediaLog : public media::MediaLog {

testing/libfuzzer/fuzzers/BUILD.gn

@@ -5,7 +5,6 @@
 # Individual libfuzzer tests that didn't find their home yet.
 
 import("//build/config/features.gni")
-import("//media/media_options.gni")
 import("//testing/libfuzzer/fuzzer_test.gni")
 import("//third_party/protobuf/proto_library.gni")
 
@@ -41,52 +40,6 @@ fuzzer_test("language_detection_fuzzer") {
   ]
 }
 
-if (proprietary_codecs) {
-  fuzzer_test("mp4_box_reader_fuzzer") {
-    sources = [
-      "mp4_box_reader_fuzzer.cc",
-    ]
-    deps = [
-      "//base",
-      "//media",
-    ]
-    libfuzzer_options = [ "max_len=500" ]
-    dict = "dicts/mp4.dict"
-  }
-}
-
-if (enable_mse_mpeg2ts_stream_parser) {
-  fuzzer_test("es_parser_adts_fuzzer") {
-    sources = [
-      "es_parser_adts_fuzzer.cc",
-    ]
-    deps = [
-      "//base",
-      "//media",
-    ]
-  }
-
-  fuzzer_test("es_parser_h264_fuzzer") {
-    sources = [
-      "es_parser_h264_fuzzer.cc",
-    ]
-    deps = [
-      "//base",
-      "//media",
-    ]
-  }
-
-  fuzzer_test("es_parser_mpeg1audio_fuzzer") {
-    sources = [
-      "es_parser_mpeg1audio_fuzzer.cc",
-    ]
-    deps = [
-      "//base",
-      "//media",
-    ]
-  }
-}
-
 fuzzer_test("snappy_fuzzer") {
   sources = [
     "snappy_fuzzer.cc",