Revert of media-internals: Simplify the code path for creating a media log entry

media/blink/webmediaplayer_impl.cc

 // Copyright 2013 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/blink/webmediaplayer_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <string>
 #include <vector>
@@ skipping 85 matching lines @@
 #undef STATIC_ASSERT_MATCHING_ENUM
 
 #define BIND_TO_RENDER_LOOP(function) \
   (DCHECK(main_task_runner_->BelongsToCurrentThread()), \
   BindToCurrentLoop(base::Bind(function, AsWeakPtr())))
 
 #define BIND_TO_RENDER_LOOP1(function, arg1) \
   (DCHECK(main_task_runner_->BelongsToCurrentThread()), \
   BindToCurrentLoop(base::Bind(function, AsWeakPtr(), arg1)))
 
+static void AddLogEntry(const scoped_refptr<MediaLog>& media_log,
+                        MediaLog::MediaLogLevel level,
+                        const std::string& message) {
+  media_log->AddEvent(media_log->CreateLogEvent(level, message));
+}
+
 static blink::WebEncryptedMediaInitDataType ConvertInitDataType(
     const std::string& init_data_type) {
   if (init_data_type == "cenc")
     return blink::WebEncryptedMediaInitDataType::Cenc;
   if (init_data_type == "keyids")
     return blink::WebEncryptedMediaInitDataType::Keyids;
   if (init_data_type == "webm")
     return blink::WebEncryptedMediaInitDataType::Webm;
   NOTREACHED() << "unexpected " << init_data_type;
   return blink::WebEncryptedMediaInitDataType::Unknown;
@@ skipping 708 matching lines @@
     data_source_->OnBufferingHaveEnough();
 
   // Blink expects a timeChanged() in response to a seek().
   if (should_notify_time_changed_)
     client_->timeChanged();
 }
 
 void WebMediaPlayerImpl::OnDemuxerOpened() {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
   client_->mediaSourceOpened(new WebMediaSourceImpl(
-      chunk_demuxer_, base::Bind(&MediaLog::AddLogEvent, media_log_)));
+      chunk_demuxer_, base::Bind(&AddLogEntry, media_log_)));
 }
 
 void WebMediaPlayerImpl::OnAddTextTrack(
     const TextTrackConfig& config,
     const AddTextTrackDoneCB& done_cb) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
 
   const WebInbandTextTrackImpl::Kind web_kind =
       static_cast<WebInbandTextTrackImpl::Kind>(config.kind());
   const blink::WebString web_label =
@@ skipping 49 matching lines @@
   if (load_type_ != LoadTypeMediaSource) {
     DCHECK(!chunk_demuxer_);
     DCHECK(data_source_);
 
     demuxer_.reset(new FFmpegDemuxer(media_task_runner_, data_source_.get(),
                                      encrypted_media_init_data_cb, media_log_));
   } else {
     DCHECK(!chunk_demuxer_);
     DCHECK(!data_source_);
 
-    mse_log_cb = base::Bind(&MediaLog::AddLogEvent, media_log_);
+    mse_log_cb = base::Bind(&AddLogEntry, media_log_);
 
     chunk_demuxer_ = new ChunkDemuxer(
         BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnDemuxerOpened),
         encrypted_media_init_data_cb, mse_log_cb, media_log_, true);
     demuxer_.reset(chunk_demuxer_);
   }
 
   // ... and we're ready to go!
   seeking_ = true;
 
@@ skipping 119 matching lines @@
 
   // pause() may be called after playback has ended and the HTMLMediaElement
   // requires that currentTime() == duration() after ending.  We want to ensure
   // |paused_time_| matches currentTime() in this case or a future seek() may
   // incorrectly discard what it thinks is a seek to the existing time.
   paused_time_ =
       ended_ ? pipeline_.GetMediaDuration() : pipeline_.GetMediaTime();
 }
 
 }  // namespace media