Revert of MSE: Verify MediaLog events created by existing WebM unit tests

media/formats/webm/webm_cluster_parser.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/formats/webm/webm_cluster_parser.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/sys_byteorder.h"
@@ skipping 223 matching lines @@
   DCHECK_GT(frame_count, 0);
   base::TimeDelta duration = base::TimeDelta::FromMicroseconds(
       kOpusFrameDurationsMu[opusConfig] * frame_count);
 
   if (duration > kPacketDurationMax) {
     // Intentionally allowing packet to pass through for now. Decoder should
     // either handle or fail gracefully. MEDIA_LOG as breadcrumbs in case
     // things go sideways.
     LIMITED_MEDIA_LOG(DEBUG, media_log_, num_duration_errors_,
                       kMaxDurationErrorLogs)
-        << "Warning, demuxed Opus packet with encoded duration: "
-        << duration.InMilliseconds() << "ms. Should be no greater than "
-        << kPacketDurationMax.InMilliseconds() << "ms.";
+        << "Warning, demuxed Opus packet with encoded duration: " << duration
+        << ". Should be no greater than " << kPacketDurationMax;
   }
 
   return duration;
 }
 
 WebMParserClient* WebMClusterParser::OnListStart(int id) {
   if (id == kWebMIdCluster) {
     cluster_timecode_ = -1;
     cluster_start_time_ = kNoTimestamp();
   } else if (id == kWebMIdBlockGroup) {
@@ skipping 298 matching lines @@
 
     if (block_duration_time_delta != kNoTimestamp()) {
       base::TimeDelta duration_difference =
           block_duration_time_delta - encoded_duration;
 
       const auto kWarnDurationDiff =
           base::TimeDelta::FromMicroseconds(timecode_multiplier_ * 2);
       if (duration_difference.magnitude() > kWarnDurationDiff) {
         LIMITED_MEDIA_LOG(DEBUG, media_log_, num_duration_errors_,
                           kMaxDurationErrorLogs)
-            << "BlockDuration (" << block_duration_time_delta.InMilliseconds()
-            << "ms) differs significantly from encoded duration ("
-            << encoded_duration.InMilliseconds() << "ms).";
+            << "BlockDuration "
+            << "(" << block_duration_time_delta << ") "
+            << "differs significantly from encoded duration "
+            << "(" << encoded_duration << ").";
       }
     }
   } else if (block_duration_time_delta != kNoTimestamp()) {
     buffer->set_duration(block_duration_time_delta);
   } else {
     DCHECK_NE(buffer_type, DemuxerStream::TEXT);
     buffer->set_duration(track->default_duration());
   }
 
   if (discard_padding != 0) {
@@ skipping 108 matching lines @@
   if (is_video_) {
     // Exposing estimation so splicing/overlap frame processing can make
     // informed decisions downstream.
     // TODO(chcunningham): Set this for audio as well in later change where
     // audio is switched to max estimation and splicing is disabled.
     last_added_buffer_missing_duration_->set_is_duration_estimated(true);
   }
 
   LIMITED_MEDIA_LOG(INFO, media_log_, num_duration_estimates_,
                     kMaxDurationEstimateLogs)
-      << "Estimating WebM block duration to be "
-      << estimated_duration.InMilliseconds()
-      << "ms for the last (Simple)Block in the Cluster for this Track. Use "
-         "BlockGroups with BlockDurations at the end of each Track in a "
-         "Cluster to avoid estimation.";
+      << "Estimating WebM block duration to be " << estimated_duration << " "
+      << "for the last (Simple)Block in the Cluster for this Track. Use "
+      << "BlockGroups with BlockDurations at the end of each Track in a "
+      << "Cluster to avoid estimation.";
 
   DVLOG(2) << __FUNCTION__ << " new dur : ts "
            << last_added_buffer_missing_duration_->timestamp().InSecondsF()
            << " dur "
            << last_added_buffer_missing_duration_->duration().InSecondsF()
            << " kf " << last_added_buffer_missing_duration_->is_key_frame()
            << " size " << last_added_buffer_missing_duration_->data_size();
 
   // Don't use the applied duration as a future estimation (don't use
   // QueueBuffer() here.)
@@ skipping 162 matching lines @@
 WebMClusterParser::FindTextTrack(int track_num) {
   const TextTrackMap::iterator it = text_track_map_.find(track_num);
 
   if (it == text_track_map_.end())
     return NULL;
 
   return &it->second;
 }
 
 }  // namespace media