Resolve merge conflict

Change-Id: Ife49b0a7d40b809caf0f389a4230038dc8f6042e
youtube · Apr 1, 2024 · 3778615 · 3778615
1 parent a8a9952
commit 3778615
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/cobalt/media/base/metrics_provider.h b/cobalt/media/base/metrics_provider.h
@@ -22,13 +22,13 @@
 #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"
-#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 {