Resolve merge conflicts

Change-Id: I8c5dc822bd8ba19f0add35c24fd1858647b2217a
youtube · Apr 2, 2024 · ebafea7 · ebafea7
1 parent 609208a
commit ebafea7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 18 deletions.
diff --git a/cobalt/media/BUILD.gn b/cobalt/media/BUILD.gn
@@ -120,11 +120,7 @@ target(gtest_target_type, "media_test") {
   sources = [
     "base/cval_stats_test.cc",
     "base/decoder_buffer_cache_test.cc",
-<<<<<<< HEAD
-=======
     "base/metrics_provider_test.cc",
-    "bidirectional_fit_reuse_allocator_test.cc",
->>>>>>> a712047ec57 (Add Seek Latency Telemetry (#2735))
     "file_data_source_test.cc",
     "progressive/demuxer_extension_wrapper_test.cc",
     "progressive/mock_data_source_reader.h",

diff --git a/cobalt/media/base/metrics_provider.h b/cobalt/media/base/metrics_provider.h
@@ -18,26 +18,17 @@
 #include <map>
 #include <string>
 
-<<<<<<< HEAD
-#include "starboard/common/mutex.h"
-#include "third_party/chromium/media/base/audio_codecs.h"
-#include "third_party/chromium/media/base/container_names.h"
-#include "third_party/chromium/media/base/pipeline_status.h"
-#include "third_party/chromium/media/base/timestamp_constants.h"
-#include "third_party/chromium/media/base/video_codecs.h"
-=======
 #include "base/containers/small_map.h"
 #include "base/time/default_tick_clock.h"
 #include "base/time/tick_clock.h"
 #include "base/time/time.h"
-#include "media/base/audio_codecs.h"
-#include "media/base/container_names.h"
-#include "media/base/pipeline_status.h"
-#include "media/base/timestamp_constants.h"
-#include "media/base/video_codecs.h"
 #include "starboard/common/mutex.h"
 #include "starboard/types.h"
->>>>>>> a712047ec57 (Add Seek Latency Telemetry (#2735))
+#include "third_party/chromium/media/base/audio_codecs.h"
+#include "third_party/chromium/media/base/container_names.h"
+#include "third_party/chromium/media/base/pipeline_status.h"
+#include "third_party/chromium/media/base/timestamp_constants.h"
+#include "third_party/chromium/media/base/video_codecs.h"
 
 namespace cobalt {
 namespace media {