MSE: Replace crossfade splicing overlap trimming.

media/base/test_helpers.h

Index: media/base/test_helpers.h
diff --git a/media/base/test_helpers.h b/media/base/test_helpers.h
index c97e9a7dc5991a5127c4f1338a152dffd6db2e49..833c0466d5c16409a01e5b27ab9c8137a1d9732b 100644
--- a/media/base/test_helpers.h
+++ b/media/base/test_helpers.h
@@ -194,13 +194,6 @@ MATCHER_P2(UnexpectedTrack, track_type, id, "") {
                                   " track track_id=" + id);
 }
 
-MATCHER_P2(GeneratedSplice, duration_microseconds, time_microseconds, "") {
-  return CONTAINS_STRING(arg, "Generated splice of overlap duration " +
-                                  base::IntToString(duration_microseconds) +
-                                  "us into new buffer at " +
-                                  base::IntToString(time_microseconds) + "us.");
-}
-
 MATCHER_P2(SkippingSpliceAtOrBefore,
            new_microseconds,
            existing_microseconds,
@@ -242,6 +235,18 @@ MATCHER(WebMClusterBeforeFirstInfo, "") {
   return CONTAINS_STRING(arg, "Found Cluster element before Info.");
 }
 
+MATCHER_P3(TrimmedSpliceOverlap,
+           splice_time_us,
+           overlapped_start_us,
+           trim_duration_us,
+           "") {
+  return CONTAINS_STRING(
+      arg, "Audio buffer splice at PTS=" + base::IntToString(splice_time_us) +
+               "us. Trimmed tail of overlapped buffer (PTS=" +
+               base::IntToString(overlapped_start_us) + "us) by " +
+               base::IntToString(trim_duration_us));
+}
+
 }  // namespace media
 
 #endif  // MEDIA_BASE_TEST_HELPERS_H_