media: Move NullMediaLog to media_util.h

To remove duplicate code. In another CL, I also need it in ClearKeyCdm.

Bug: 169203
Test: No functionality change.
Change-Id: I077d0b52780e960f4da6e974405eff6a2dd2fe06
Reviewed-on: https://chromium-review.googlesource.com/1247561Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#594563}

media/base/media_util.h

@@ -8,8 +8,10 @@
 #include <stdint.h>
 #include <vector>
 
+#include "base/macros.h"
 #include "media/base/encryption_scheme.h"
 #include "media/base/media_export.h"
+#include "media/base/media_log.h"
 
 namespace media {
 
@@ -22,6 +24,17 @@ MEDIA_EXPORT std::vector<uint8_t> EmptyExtraData();
 MEDIA_EXPORT EncryptionScheme Unencrypted();
 MEDIA_EXPORT EncryptionScheme AesCtrEncryptionScheme();
 
+class MEDIA_EXPORT NullMediaLog : public media::MediaLog {
+ public:
+  NullMediaLog() = default;
+  ~NullMediaLog() override = default;
+
+  void AddEventLocked(std::unique_ptr<media::MediaLogEvent> event) override {}
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(NullMediaLog);
+};
+
 }  // namespace media
 
 #endif  // MEDIA_BASE_MEDIA_UTIL_H_

media/formats/mp2t/es_parser_mpeg1audio_fuzzer.cc

@@ -8,26 +8,15 @@
 #include <memory>
 
 #include "base/bind.h"
-#include "media/base/media_log.h"
+#include "media/base/media_util.h"
 #include "media/formats/mp2t/es_parser_mpeg1audio.h"
 
-class NullMediaLog : public media::MediaLog {
- public:
-  NullMediaLog() {}
-  ~NullMediaLog() override {}
-
-  void AddEventLocked(std::unique_ptr<media::MediaLogEvent> event) override {}
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(NullMediaLog);
-};
-
 static void NewAudioConfig(const media::AudioDecoderConfig& config) {}
 static void EmitBuffer(scoped_refptr<media::StreamParserBuffer> buffer) {}
 
 // Entry point for LibFuzzer.
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
-  NullMediaLog media_log;
+  media::NullMediaLog media_log;
   media::mp2t::EsParserMpeg1Audio es_parser(
       base::Bind(&NewAudioConfig), base::Bind(&EmitBuffer), &media_log);
   if (es_parser.Parse(data, size, media::kNoTimestamp,

media/formats/mp4/mp4_box_reader_fuzzer.cc

@@ -8,24 +8,12 @@
 #include <memory>
 
 #include "base/logging.h"
-#include "base/macros.h"
-#include "media/base/media_log.h"
+#include "media/base/media_util.h"
 #include "media/formats/mp4/box_reader.h"
 
-class NullMediaLog : public media::MediaLog {
- public:
-  NullMediaLog() = default;
-  ~NullMediaLog() override = default;
-
-  void AddEventLocked(std::unique_ptr<media::MediaLogEvent> event) override {}
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(NullMediaLog);
-};
-
 // Entry point for LibFuzzer.
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
-  NullMediaLog media_log;
+  media::NullMediaLog media_log;
   std::unique_ptr<media::mp4::BoxReader> reader;
   if (media::mp4::BoxReader::ReadTopLevelBox(data, size, &media_log, &reader) ==
       media::mp4::ParseResult::kOk) {