diff --git a/packager/file/file_test_util.cc b/packager/file/file_test_util.cc
index ea656d9fd75..4726e57b6ff 100644
--- a/packager/file/file_test_util.cc
+++ b/packager/file/file_test_util.cc
@@ -34,6 +34,12 @@ std::string generate_unique_temp_path() {
   return temp_path_template_string;
 }
 
+void delete_file(const std::string& path) {
+  std::error_code ec;
+  std::filesystem::remove(path, ec);
+  // Ignore errors.
+}
+
 TempFile::TempFile() : path_(generate_unique_temp_path()) {}
 
 TempFile::~TempFile() {
diff --git a/packager/file/file_test_util.h b/packager/file/file_test_util.h
index 6e7b614b6b2..6800f9c15bc 100644
--- a/packager/file/file_test_util.h
+++ b/packager/file/file_test_util.h
@@ -43,6 +43,7 @@ namespace shaka {
 
 // Generate a unique filename.
 std::string generate_unique_temp_path();
+void delete_file(const std::string& path);
 
 // A temporary file that is removed from the filesystem when the object is
 // destroyed.  Useful in tests that use ASSERT to avoid leaving behind temp
diff --git a/packager/media/CMakeLists.txt b/packager/media/CMakeLists.txt
index 587051732f7..4e3914f232e 100644
--- a/packager/media/CMakeLists.txt
+++ b/packager/media/CMakeLists.txt
@@ -7,6 +7,7 @@
 # Subdirectories with their own CMakeLists.txt, all of whose targets are built.
 add_subdirectory(base)
 add_subdirectory(codecs)
+add_subdirectory(event)
 add_subdirectory(formats)
 add_subdirectory(origin)
 add_subdirectory(replicator)
diff --git a/packager/media/event/CMakeLists.txt b/packager/media/event/CMakeLists.txt
new file mode 100644
index 00000000000..a75e36d928f
--- /dev/null
+++ b/packager/media/event/CMakeLists.txt
@@ -0,0 +1,64 @@
+# Copyright 2022 Google LLC. All rights reserved.
+#
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file or at
+# https://developers.google.com/open-source/licenses/bsd
+
+add_library(media_event STATIC
+    combined_muxer_listener.cc
+    hls_notify_muxer_listener.cc
+    mpd_notify_muxer_listener.cc
+    multi_codec_muxer_listener.cc
+    muxer_listener_factory.cc
+    muxer_listener_internal.cc
+    vod_media_info_dump_muxer_listener.cc
+)
+
+target_link_libraries(media_event
+    file
+    mpd_media_info_proto
+    media_base
+    codecs
+)
+
+add_library(mock_muxer_listener STATIC
+    mock_muxer_listener.cc
+)
+
+target_link_libraries(mock_muxer_listener
+    gmock
+    media_event
+)
+
+add_executable(media_event_unittest
+    hls_notify_muxer_listener_unittest.cc
+    muxer_listener_internal_unittest.cc
+#    needs MockMpdNotifier from mpd/base
+#    mpd_notify_muxer_listener_unittest.cc
+    multi_codec_muxer_listener_unittest.cc
+    muxer_listener_test_helper.cc
+    vod_media_info_dump_muxer_listener_unittest.cc
+)
+
+#target_link_libraries(media_base_unittest
+#  file
+#  file_test_util
+#  media_base
+#  gmock
+#  gtest
+#  gtest_main
+#  test_data_util)
+#
+
+target_link_libraries(media_event_unittest
+    file
+    file_test_util
+    mpd_media_info_proto
+    gmock
+    gtest
+    gtest_main
+    media_event
+    mock_muxer_listener
+)
+
+add_test(NAME media_base_unittest COMMAND media_event_unittest)
diff --git a/packager/media/event/combined_muxer_listener.h b/packager/media/event/combined_muxer_listener.h
index 1b48deec21a..03612de52d4 100644
--- a/packager/media/event/combined_muxer_listener.h
+++ b/packager/media/event/combined_muxer_listener.h
@@ -47,7 +47,7 @@ class CombinedMuxerListener : public MuxerListener {
                     uint64_t segment_file_size) override;
   void OnCompletedSegment(int64_t duration,
                           uint64_t segment_file_size) override;
-  void OnKeyFrame(int64_t timestamp, uint64_t start_byte_offset, uint64_t size);
+  void OnKeyFrame(int64_t timestamp, uint64_t start_byte_offset, uint64_t size) override;
   void OnCueEvent(int64_t timestamp, const std::string& cue_data) override;
   /// @}
 
diff --git a/packager/media/event/hls_notify_muxer_listener.cc b/packager/media/event/hls_notify_muxer_listener.cc
index f48b0074174..f05a78a8503 100644
--- a/packager/media/event/hls_notify_muxer_listener.cc
+++ b/packager/media/event/hls_notify_muxer_listener.cc
@@ -7,7 +7,8 @@
 #include "packager/media/event/hls_notify_muxer_listener.h"
 
 #include <memory>
-#include "packager/base/logging.h"
+
+#include "glog/logging.h"
 #include "packager/hls/base/hls_notifier.h"
 #include "packager/media/base/muxer_options.h"
 #include "packager/media/base/protection_system_specific_info.h"
diff --git a/packager/media/event/hls_notify_muxer_listener.h b/packager/media/event/hls_notify_muxer_listener.h
index b31078b185a..95ee6095051 100644
--- a/packager/media/event/hls_notify_muxer_listener.h
+++ b/packager/media/event/hls_notify_muxer_listener.h
@@ -8,10 +8,10 @@
 #define PACKAGER_MEDIA_EVENT_HLS_NOTIFY_MUXER_LISTENER_H_
 
 #include <memory>
+#include <optional>
 #include <string>
 #include <vector>
 
-#include "packager/base/optional.h"
 #include "packager/media/event/event_info.h"
 #include "packager/media/event/muxer_listener.h"
 #include "packager/mpd/base/media_info.pb.h"
@@ -68,7 +68,7 @@ class HlsNotifyMuxerListener : public MuxerListener {
                     int64_t start_time,
                     int64_t duration,
                     uint64_t segment_file_size) override;
-  void OnKeyFrame(int64_t timestamp, uint64_t start_byte_offset, uint64_t size);
+  void OnKeyFrame(int64_t timestamp, uint64_t start_byte_offset, uint64_t size) override;
   void OnCueEvent(int64_t timestamp, const std::string& cue_data) override;
   /// @}
 
@@ -84,7 +84,7 @@ class HlsNotifyMuxerListener : public MuxerListener {
   const std::string ext_x_media_group_id_;
   const std::vector<std::string> characteristics_;
   hls::HlsNotifier* const hls_notifier_;
-  base::Optional<uint32_t> stream_id_;
+  std::optional<uint32_t> stream_id_;
 
   bool must_notify_encryption_start_ = false;
   // Cached encryption info before OnMediaStart() is called.
diff --git a/packager/media/event/hls_notify_muxer_listener_unittest.cc b/packager/media/event/hls_notify_muxer_listener_unittest.cc
index ba418c9cf4d..c5e62d71b2c 100644
--- a/packager/media/event/hls_notify_muxer_listener_unittest.cc
+++ b/packager/media/event/hls_notify_muxer_listener_unittest.cc
@@ -177,8 +177,8 @@ TEST_F(HlsNotifyMuxerListenerTest, OnMediaStart) {
 // OnEncryptionInfoReady() and OnMediaStart().
 TEST_F(HlsNotifyMuxerListenerTest, OnEncryptionStart) {
   std::vector<uint8_t> system_id(kAnySystemId,
-                                 kAnySystemId + arraysize(kAnySystemId));
-  std::vector<uint8_t> pssh(kAnyData, kAnyData + arraysize(kAnyData));
+                                 kAnySystemId + std::size(kAnySystemId));
+  std::vector<uint8_t> pssh(kAnyData, kAnyData + std::size(kAnyData));
   std::vector<uint8_t> key_id(16, 0x05);
   std::vector<uint8_t> iv(16, 0x54);
 
@@ -211,8 +211,8 @@ TEST_F(HlsNotifyMuxerListenerTest, OnEncryptionStart) {
 // OnMediaStart().
 TEST_F(HlsNotifyMuxerListenerTest, OnEncryptionStartBeforeMediaStart) {
   std::vector<uint8_t> system_id(kAnySystemId,
-                                 kAnySystemId + arraysize(kAnySystemId));
-  std::vector<uint8_t> pssh(kAnyData, kAnyData + arraysize(kAnyData));
+                                 kAnySystemId + std::size(kAnySystemId));
+  std::vector<uint8_t> pssh(kAnyData, kAnyData + std::size(kAnyData));
   std::vector<uint8_t> key_id(16, 0x05);
   std::vector<uint8_t> iv(16, 0x54);
 
@@ -278,8 +278,8 @@ TEST_F(HlsNotifyMuxerListenerTest, OnEncryptionInfoReady) {
                          MuxerListener::kContainerMpeg2ts);
 
   std::vector<uint8_t> system_id(kAnySystemId,
-                                 kAnySystemId + arraysize(kAnySystemId));
-  std::vector<uint8_t> pssh(kAnyData, kAnyData + arraysize(kAnyData));
+                                 kAnySystemId + std::size(kAnySystemId));
+  std::vector<uint8_t> pssh(kAnyData, kAnyData + std::size(kAnyData));
   std::vector<uint8_t> key_id(16, 0x05);
   std::vector<uint8_t> iv(16, 0x54);
 
diff --git a/packager/media/event/mpd_notify_muxer_listener.cc b/packager/media/event/mpd_notify_muxer_listener.cc
index 1288554c90b..91a4aefc56b 100644
--- a/packager/media/event/mpd_notify_muxer_listener.cc
+++ b/packager/media/event/mpd_notify_muxer_listener.cc
@@ -8,7 +8,7 @@
 
 #include <cmath>
 
-#include "packager/base/logging.h"
+#include "glog/logging.h"
 #include "packager/media/base/audio_stream_info.h"
 #include "packager/media/base/protection_system_specific_info.h"
 #include "packager/media/base/video_stream_info.h"
diff --git a/packager/media/event/mpd_notify_muxer_listener.h b/packager/media/event/mpd_notify_muxer_listener.h
index 9561476bc37..1356db21905 100644
--- a/packager/media/event/mpd_notify_muxer_listener.h
+++ b/packager/media/event/mpd_notify_muxer_listener.h
@@ -10,9 +10,9 @@
 #define PACKAGER_MEDIA_EVENT_MPD_NOTIFY_MUXER_LISTENER_H_
 
 #include <memory>
+#include <optional>
 #include <vector>
 
-#include "packager/base/optional.h"
 #include "packager/media/base/muxer_options.h"
 #include "packager/media/event/event_info.h"
 #include "packager/media/event/muxer_listener.h"
@@ -55,7 +55,7 @@ class MpdNotifyMuxerListener : public MuxerListener {
                     uint64_t segment_file_size) override;
   void OnCompletedSegment(int64_t duration,
                           uint64_t segment_file_size) override;
-  void OnKeyFrame(int64_t timestamp, uint64_t start_byte_offset, uint64_t size);
+  void OnKeyFrame(int64_t timestamp, uint64_t start_byte_offset, uint64_t size) override;
   void OnCueEvent(int64_t timestamp, const std::string& cue_data) override;
   /// @}
 
@@ -72,7 +72,7 @@ class MpdNotifyMuxerListener : public MuxerListener {
   bool NotifyNewContainer();
 
   MpdNotifier* const mpd_notifier_ = nullptr;
-  base::Optional<uint32_t> notification_id_;
+  std::optional<uint32_t> notification_id_;
   std::unique_ptr<MediaInfo> media_info_;
 
   std::vector<std::string> accessibilities_;
diff --git a/packager/media/event/mpd_notify_muxer_listener_unittest.cc b/packager/media/event/mpd_notify_muxer_listener_unittest.cc
index a346aea65d3..7b45673e2de 100644
--- a/packager/media/event/mpd_notify_muxer_listener_unittest.cc
+++ b/packager/media/event/mpd_notify_muxer_listener_unittest.cc
@@ -13,7 +13,6 @@
 #include <algorithm>
 #include <vector>
 
-#include "packager/base/stl_util.h"
 #include "packager/media/base/video_stream_info.h"
 #include "packager/media/event/muxer_listener_test_helper.h"
 #include "packager/mpd/base/content_protection_element.h"
@@ -204,7 +203,7 @@ TEST_F(MpdNotifyMuxerListenerTest, VodEncryptedContent) {
       CreateVideoStreamInfo(video_params);
 
   const std::vector<uint8_t> default_key_id(
-      kDefaultKeyId, kDefaultKeyId + arraysize(kDefaultKeyId) - 1);
+      kDefaultKeyId, kDefaultKeyId + std::size(kDefaultKeyId) - 1);
 
   const std::string kExpectedMediaInfo =
       std::string(kExpectedDefaultMediaInfo) +
@@ -220,7 +219,7 @@ TEST_F(MpdNotifyMuxerListenerTest, VodEncryptedContent) {
 
   EXPECT_CALL(*notifier_, NotifyNewContainer(_, _)).Times(0);
 
-  std::vector<uint8_t> iv(kBogusIv, kBogusIv + arraysize(kBogusIv));
+  std::vector<uint8_t> iv(kBogusIv, kBogusIv + std::size(kBogusIv));
   listener_->OnEncryptionInfoReady(kInitialEncryptionInfo, FOURCC_cenc,
                                    default_key_id, iv,
                                    GetDefaultKeySystemInfo());
@@ -247,7 +246,7 @@ TEST_F(MpdNotifyMuxerListenerTest, VodEncryptedContentSegmentList) {
       CreateVideoStreamInfo(video_params);
 
   const std::vector<uint8_t> default_key_id(
-      kDefaultKeyId, kDefaultKeyId + arraysize(kDefaultKeyId) - 1);
+      kDefaultKeyId, kDefaultKeyId + std::size(kDefaultKeyId) - 1);
 
   const std::string kExpectedMediaInfo =
       std::string(kExpectedDefaultMediaInfoSubsegmentRange) +
@@ -263,7 +262,7 @@ TEST_F(MpdNotifyMuxerListenerTest, VodEncryptedContentSegmentList) {
 
   EXPECT_CALL(*notifier_, NotifyNewContainer(_, _)).Times(0);
 
-  std::vector<uint8_t> iv(kBogusIv, kBogusIv + arraysize(kBogusIv));
+  std::vector<uint8_t> iv(kBogusIv, kBogusIv + std::size(kBogusIv));
   listener_->OnEncryptionInfoReady(kInitialEncryptionInfo, FOURCC_cenc,
                                    default_key_id, iv,
                                    GetDefaultKeySystemInfo());
@@ -681,7 +680,7 @@ TEST_P(MpdNotifyMuxerListenerTest, LiveNoKeyRotation) {
   const int64_t kDuration2 = 3787;
   const uint64_t kSegmentFileSize2 = 83743u;
   const std::vector<uint8_t> default_key_id(
-      kDefaultKeyId, kDefaultKeyId + arraysize(kDefaultKeyId) - 1);
+      kDefaultKeyId, kDefaultKeyId + std::size(kDefaultKeyId) - 1);
 
   InSequence s;
   EXPECT_CALL(*notifier_, NotifyEncryptionUpdate(_, _, _, _)).Times(0);
@@ -699,7 +698,7 @@ TEST_P(MpdNotifyMuxerListenerTest, LiveNoKeyRotation) {
   if (GetParam() == MpdType::kDynamic)
     EXPECT_CALL(*notifier_, Flush());
 
-  std::vector<uint8_t> iv(kBogusIv, kBogusIv + arraysize(kBogusIv));
+  std::vector<uint8_t> iv(kBogusIv, kBogusIv + std::size(kBogusIv));
   listener_->OnEncryptionInfoReady(kInitialEncryptionInfo, FOURCC_cbcs,
                                    default_key_id, iv,
                                    GetDefaultKeySystemInfo());
@@ -754,7 +753,7 @@ TEST_P(MpdNotifyMuxerListenerTest, LiveWithKeyRotation) {
   const int64_t kDuration2 = 3787;
   const uint64_t kSegmentFileSize2 = 83743u;
   const std::vector<uint8_t> default_key_id(
-      kDefaultKeyId, kDefaultKeyId + arraysize(kDefaultKeyId) - 1);
+      kDefaultKeyId, kDefaultKeyId + std::size(kDefaultKeyId) - 1);
 
   InSequence s;
   EXPECT_CALL(*notifier_,
@@ -771,7 +770,7 @@ TEST_P(MpdNotifyMuxerListenerTest, LiveWithKeyRotation) {
   if (GetParam() == MpdType::kDynamic)
     EXPECT_CALL(*notifier_, Flush());
 
-  std::vector<uint8_t> iv(kBogusIv, kBogusIv + arraysize(kBogusIv));
+  std::vector<uint8_t> iv(kBogusIv, kBogusIv + std::size(kBogusIv));
   listener_->OnEncryptionInfoReady(kInitialEncryptionInfo, FOURCC_cbc1,
                                    default_key_id, iv,
                                    std::vector<ProtectionSystemSpecificInfo>());
diff --git a/packager/media/event/multi_codec_muxer_listener.cc b/packager/media/event/multi_codec_muxer_listener.cc
index c7d182ac05d..e2191e63cea 100644
--- a/packager/media/event/multi_codec_muxer_listener.cc
+++ b/packager/media/event/multi_codec_muxer_listener.cc
@@ -6,8 +6,8 @@
 
 #include "packager/media/event/multi_codec_muxer_listener.h"
 
-#include "packager/base/logging.h"
-#include "packager/base/strings/string_split.h"
+#include "absl/strings/str_split.h"
+#include "glog/logging.h"
 #include "packager/media/base/stream_info.h"
 
 namespace shaka {
@@ -18,11 +18,10 @@ void MultiCodecMuxerListener::OnMediaStart(const MuxerOptions& muxer_options,
                                            int32_t time_scale,
                                            ContainerType container_type) {
   size_t num_codecs = 0;
-  for (const std::string& codec_string :
-       base::SplitString(stream_info.codec_string(), ";", base::KEEP_WHITESPACE,
-                         base::SPLIT_WANT_NONEMPTY)) {
+  for (const auto& codec_string :
+       absl::StrSplit(stream_info.codec_string(), ";", absl::SkipEmpty())) {
     std::unique_ptr<StreamInfo> current_stream_info = stream_info.Clone();
-    current_stream_info->set_codec_string(codec_string);
+    current_stream_info->set_codec_string(std::string(codec_string));
     MuxerListener* current_muxer_listener = MuxerListenerAt(num_codecs++);
     if (!current_muxer_listener) {
       LOG(WARNING) << "'" << codec_string << "' is not handled.";
diff --git a/packager/media/event/muxer_listener.h b/packager/media/event/muxer_listener.h
index 17a7f455e8e..15350fb3154 100644
--- a/packager/media/event/muxer_listener.h
+++ b/packager/media/event/muxer_listener.h
@@ -15,6 +15,7 @@
 #include <string>
 #include <vector>
 
+#include "packager/macros.h"
 #include "packager/media/base/fourccs.h"
 #include "packager/media/base/range.h"
 
diff --git a/packager/media/event/muxer_listener_factory.cc b/packager/media/event/muxer_listener_factory.cc
index 8a3054c8dbe..2e23c7735fa 100644
--- a/packager/media/event/muxer_listener_factory.cc
+++ b/packager/media/event/muxer_listener_factory.cc
@@ -8,8 +8,8 @@
 
 #include <list>
 
-#include "packager/base/memory/ptr_util.h"
-#include "packager/base/strings/stringprintf.h"
+#include "absl/strings/str_format.h"
+#include "glog/logging.h"
 #include "packager/hls/base/hls_notifier.h"
 #include "packager/media/event/combined_muxer_listener.h"
 #include "packager/media/event/hls_notify_muxer_listener.h"
@@ -39,7 +39,7 @@ std::unique_ptr<MuxerListener> CreateMpdListenerInternal(
     MpdNotifier* notifier) {
   DCHECK(notifier);
 
-  auto listener = base::MakeUnique<MpdNotifyMuxerListener>(notifier);
+  auto listener = std::make_unique<MpdNotifyMuxerListener>(notifier);
   listener->set_accessibilities(stream.dash_accessiblities);
   listener->set_roles(stream.dash_roles);
   return listener;
@@ -60,11 +60,11 @@ std::list<std::unique_ptr<MuxerListener>> CreateHlsListenersInternal(
   const std::vector<std::string>& characteristics = stream.hls_characteristics;
 
   if (name.empty()) {
-    name = base::StringPrintf("stream_%d", stream_index);
+    name = absl::StrFormat("stream_%d", stream_index);
   }
 
   if (playlist_name.empty()) {
-    playlist_name = base::StringPrintf("stream_%d.m3u8", stream_index);
+    playlist_name = absl::StrFormat("stream_%d.m3u8", stream_index);
   }
 
   const bool kIFramesOnly = true;
@@ -125,7 +125,7 @@ std::unique_ptr<MuxerListener> MuxerListenerFactory::CreateListener(
     multi_codec_listener->AddListener(std::move(combined_listener));
   }
 
-  return std::move(multi_codec_listener);
+  return multi_codec_listener;
 }
 
 std::unique_ptr<MuxerListener> MuxerListenerFactory::CreateHlsListener(
diff --git a/packager/media/event/muxer_listener_internal.cc b/packager/media/event/muxer_listener_internal.cc
index 49e4329b0c0..6a1f391cd25 100644
--- a/packager/media/event/muxer_listener_internal.cc
+++ b/packager/media/event/muxer_listener_internal.cc
@@ -9,17 +9,17 @@
 #include <google/protobuf/util/message_differencer.h>
 #include <math.h>
 
-#include "packager/base/logging.h"
-#include "packager/base/strings/string_number_conversions.h"
-#include "packager/base/strings/string_util.h"
+#include "absl/strings/escaping.h"
+#include "glog/logging.h"
 #include "packager/media/base/audio_stream_info.h"
 #include "packager/media/base/muxer_options.h"
 #include "packager/media/base/protection_system_specific_info.h"
 #include "packager/media/base/text_stream_info.h"
 #include "packager/media/base/video_stream_info.h"
-#include "packager/media/codecs/ec3_audio_util.h"
 #include "packager/media/codecs/ac4_audio_util.h"
+#include "packager/media/codecs/ec3_audio_util.h"
 #include "packager/mpd/base/media_info.pb.h"
+#include "packager/utils/bytes_to_string_view.h"
 
 using ::google::protobuf::util::MessageDifferencer;
 
@@ -60,7 +60,7 @@ void SetMediaInfoContainerType(MuxerListener::ContainerType container_type,
       media_info->set_container_type(MediaInfo::CONTAINER_TEXT);
       break;
     default:
-      NOTREACHED() << "Unknown container type " << container_type;
+      NOTIMPLEMENTED() << "Unknown container type " << container_type;
   }
 }
 
@@ -309,8 +309,8 @@ void SetContentProtectionFields(
 
 std::string CreateUUIDString(const std::vector<uint8_t>& data) {
   DCHECK_EQ(16u, data.size());
-  std::string uuid =
-      base::ToLowerASCII(base::HexEncode(data.data(), data.size()));
+  std::string uuid = absl::AsciiStrToLower(
+      absl::BytesToHexString(byte_vector_to_string_view(data)));
   uuid.insert(20, "-");
   uuid.insert(16, "-");
   uuid.insert(12, "-");
diff --git a/packager/media/event/vod_media_info_dump_muxer_listener.cc b/packager/media/event/vod_media_info_dump_muxer_listener.cc
index 28cd81b2b42..ff075f7d28f 100644
--- a/packager/media/event/vod_media_info_dump_muxer_listener.cc
+++ b/packager/media/event/vod_media_info_dump_muxer_listener.cc
@@ -10,7 +10,7 @@
 
 #include <cmath>
 
-#include "packager/base/logging.h"
+#include "glog/logging.h"
 #include "packager/file/file.h"
 #include "packager/media/base/muxer_options.h"
 #include "packager/media/base/protection_system_specific_info.h"
diff --git a/packager/media/event/vod_media_info_dump_muxer_listener.h b/packager/media/event/vod_media_info_dump_muxer_listener.h
index 8fabb83ad0f..c3e8d4c35cc 100644
--- a/packager/media/event/vod_media_info_dump_muxer_listener.h
+++ b/packager/media/event/vod_media_info_dump_muxer_listener.h
@@ -15,7 +15,7 @@
 #include <string>
 #include <vector>
 
-#include "packager/base/macros.h"
+#include "packager/macros.h"
 #include "packager/media/base/muxer_options.h"
 #include "packager/media/event/muxer_listener.h"
 
diff --git a/packager/media/event/vod_media_info_dump_muxer_listener_unittest.cc b/packager/media/event/vod_media_info_dump_muxer_listener_unittest.cc
index b7edb828409..5b2b1b79d2d 100644
--- a/packager/media/event/vod_media_info_dump_muxer_listener_unittest.cc
+++ b/packager/media/event/vod_media_info_dump_muxer_listener_unittest.cc
@@ -4,6 +4,8 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#include "packager/media/event/vod_media_info_dump_muxer_listener.h"
+
 #include <gmock/gmock.h>
 #include <google/protobuf/text_format.h>
 #include <google/protobuf/util/message_differencer.h>
@@ -11,14 +13,12 @@
 
 #include <vector>
 
-#include "packager/base/files/file_path.h"
-#include "packager/base/files/file_util.h"
 #include "packager/file/file.h"
+#include "packager/file/file_test_util.h"
 #include "packager/media/base/fourccs.h"
 #include "packager/media/base/muxer_options.h"
 #include "packager/media/base/video_stream_info.h"
 #include "packager/media/event/muxer_listener_test_helper.h"
-#include "packager/media/event/vod_media_info_dump_muxer_listener.h"
 #include "packager/mpd/base/media_info.pb.h"
 
 namespace {
@@ -67,21 +67,17 @@ class VodMediaInfoDumpMuxerListenerTest : public ::testing::Test {
   ~VodMediaInfoDumpMuxerListenerTest() override {}
 
   void SetUp() override {
-    ASSERT_TRUE(base::CreateTemporaryFile(&temp_file_path_));
-    DLOG(INFO) << "Created temp file: " << temp_file_path_.value();
-
-    listener_.reset(new VodMediaInfoDumpMuxerListener(temp_file_path_
-                  .AsUTF8Unsafe(),false));
+    temp_file_path_ = generate_unique_temp_path();
+    DLOG(INFO) << "Created temp file: " << temp_file_path_;
 
+    listener_.reset(new VodMediaInfoDumpMuxerListener(temp_file_path_, false));
   }
 
   void SetSegmentListFlag() {
     listener_->set_use_segment_list(true);
   }
 
-  void TearDown() override {
-    base::DeleteFile(temp_file_path_, false);
-  }
+  void TearDown() override { delete_file(temp_file_path_); }
 
   void FireOnMediaStartWithDefaultMuxerOptions(
       const StreamInfo& stream_info,
@@ -92,8 +88,8 @@ class VodMediaInfoDumpMuxerListenerTest : public ::testing::Test {
     if (enable_encryption) {
       std::vector<uint8_t> bogus_default_key_id(
           kBogusDefaultKeyId,
-          kBogusDefaultKeyId + arraysize(kBogusDefaultKeyId));
-      std::vector<uint8_t> bogus_iv(kBogusIv, kBogusIv + arraysize(kBogusIv));
+          kBogusDefaultKeyId + std::size(kBogusDefaultKeyId));
+      std::vector<uint8_t> bogus_iv(kBogusIv, kBogusIv + std::size(kBogusIv));
 
       listener_->OnEncryptionInfoReady(kInitialEncryptionInfo, FOURCC_cenc,
                                        bogus_default_key_id, bogus_iv,
@@ -114,7 +110,7 @@ class VodMediaInfoDumpMuxerListenerTest : public ::testing::Test {
   }
 
  protected:
-  base::FilePath temp_file_path_;
+  std::string temp_file_path_;
   std::unique_ptr<VodMediaInfoDumpMuxerListener> listener_;
 
  private:
@@ -151,8 +147,7 @@ TEST_F(VodMediaInfoDumpMuxerListenerTest, UnencryptedStream_Normal) {
       "container_type: 1\n"
       "media_file_name: 'test_output_file_name.mp4'\n"
       "media_duration_seconds: 10.5\n";
-  EXPECT_THAT(temp_file_path_.AsUTF8Unsafe(),
-              FileContentEqualsProto(kExpectedProtobufOutput));
+  EXPECT_THAT(temp_file_path_, FileContentEqualsProto(kExpectedProtobufOutput));
 }
 
 TEST_F(VodMediaInfoDumpMuxerListenerTest, EncryptedStream_Normal) {
@@ -195,8 +190,7 @@ TEST_F(VodMediaInfoDumpMuxerListenerTest, EncryptedStream_Normal) {
       "  protection_scheme: 'cenc'\n"
       "}\n";
 
-  EXPECT_THAT(temp_file_path_.AsUTF8Unsafe(),
-              FileContentEqualsProto(kExpectedProtobufOutput));
+  EXPECT_THAT(temp_file_path_, FileContentEqualsProto(kExpectedProtobufOutput));
 }
 
 // Verify that VideoStreamInfo with non-0 pixel_{width,height} is set in the
@@ -234,8 +228,7 @@ TEST_F(VodMediaInfoDumpMuxerListenerTest, CheckPixelWidthAndHeightSet) {
       "media_file_name: 'test_output_file_name.mp4'\n"
       "media_duration_seconds: 10.5\n";
 
-  EXPECT_THAT(temp_file_path_.AsUTF8Unsafe(),
-              FileContentEqualsProto(kExpectedProtobufOutput));
+  EXPECT_THAT(temp_file_path_, FileContentEqualsProto(kExpectedProtobufOutput));
 }
 
 TEST_F(VodMediaInfoDumpMuxerListenerTest, CheckBandwidth) {
@@ -276,8 +269,7 @@ TEST_F(VodMediaInfoDumpMuxerListenerTest, CheckBandwidth) {
       "container_type: 1\n"
       "media_file_name: 'test_output_file_name.mp4'\n"
       "media_duration_seconds: 10.5\n";
-  EXPECT_THAT(temp_file_path_.AsUTF8Unsafe(),
-              FileContentEqualsProto(kExpectedProtobufOutput));
+  EXPECT_THAT(temp_file_path_, FileContentEqualsProto(kExpectedProtobufOutput));
 }
 
 // Equivalent tests with segment list flag on which writes subsegment ranges
@@ -318,8 +310,7 @@ TEST_F(VodMediaInfoDumpMuxerListenerTest, UnencryptedStream_Normal_SegmentList)
       "  begin: 222\n"
       "  end: 9999\n"
       "}\n";
-  EXPECT_THAT(temp_file_path_.AsUTF8Unsafe(),
-              FileContentEqualsProto(kExpectedProtobufOutput));
+  EXPECT_THAT(temp_file_path_, FileContentEqualsProto(kExpectedProtobufOutput));
 }
 
 }  // namespace media
diff --git a/packager/mpd/base/mpd_notifier.h b/packager/mpd/base/mpd_notifier.h
index 7a3805836b2..531da514ab7 100644
--- a/packager/mpd/base/mpd_notifier.h
+++ b/packager/mpd/base/mpd_notifier.h
@@ -11,10 +11,11 @@
 #define MPD_BASE_MPD_NOTIFIER_H_
 
 #include <stdint.h>
+
 #include <string>
 #include <vector>
 
-#include "packager/base/macros.h"
+#include "packager/macros.h"
 #include "packager/mpd/base/mpd_options.h"
 
 namespace shaka {