BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 14 insertions, 8 deletions

diff --git a/chromium/media/base/decoder_buffer.cc b/chromium/media/base/decoder_buffer.cc
index 0a593b8d6ef..995e1044db7 100644
--- a/chromium/media/base/decoder_buffer.cc
+++ b/chromium/media/base/decoder_buffer.cc
@@ -164,21 +164,27 @@ bool DecoderBuffer::MatchesForTesting(const DecoderBuffer& buffer) const {
                           : true;
 }
 
-std::string DecoderBuffer::AsHumanReadableString() const {
+std::string DecoderBuffer::AsHumanReadableString(bool verbose) const {
   if (end_of_stream())
     return "EOS";
 
   std::ostringstream s;
-  s << "timestamp=" << timestamp_.InMicroseconds()
+
+  s << "{timestamp=" << timestamp_.InMicroseconds()
     << " duration=" << duration_.InMicroseconds() << " size=" << size_
-    << " side_data_size=" << side_data_size_
     << " is_key_frame=" << is_key_frame_
-    << " encrypted=" << (decrypt_config_ != NULL) << " discard_padding (us)=("
-    << discard_padding_.first.InMicroseconds() << ", "
-    << discard_padding_.second.InMicroseconds() << ")";
+    << " encrypted=" << (decrypt_config_ != nullptr);
+
+  if (verbose) {
+    s << " side_data_size=" << side_data_size_ << " discard_padding (us)=("
+      << discard_padding_.first.InMicroseconds() << ", "
+      << discard_padding_.second.InMicroseconds() << ")";
+
+    if (decrypt_config_)
+      s << " decrypt_config=" << (*decrypt_config_);
+  }
 
-  if (decrypt_config_)
-    s << " decrypt=" << (*decrypt_config_);
+  s << "}";
 
   return s.str();
 }