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

content/renderer/media/android/media_source_delegate.cc

Index: content/renderer/media/android/media_source_delegate.cc
diff --git a/content/renderer/media/android/media_source_delegate.cc b/content/renderer/media/android/media_source_delegate.cc
index b22a68a30a7c5b737833b18ac6068d32833f1c48..792148e9b7cebc303ce05e8fe587deb641b52aaa 100644
--- a/content/renderer/media/android/media_source_delegate.cc
+++ b/content/renderer/media/android/media_source_delegate.cc
@@ -39,6 +39,12 @@
 }  // namespace
 
 namespace content {
+
+static void AddLogEntry(const scoped_refptr<media::MediaLog>& media_log,
+                        media::MediaLog::MediaLogLevel level,
+                        const std::string& message) {
+  media_log->AddEvent(media_log->CreateLogEvent(level, message));
+}
 
 MediaSourceDelegate::MediaSourceDelegate(
     RendererDemuxerAndroid* demuxer_client,
@@ -165,8 +171,7 @@
           base::Bind(&MediaSourceDelegate::OnDemuxerOpened, main_weak_this_)),
       media::BindToCurrentLoop(base::Bind(
           &MediaSourceDelegate::OnEncryptedMediaInitData, main_weak_this_)),
-      base::Bind(&media::MediaLog::AddLogEvent, media_log_), media_log_,
-      false));
+      base::Bind(&AddLogEntry, media_log_), media_log_, false));
 
   // |this| will be retained until StopDemuxer() is posted, so Unretained() is
   // safe here.
@@ -665,8 +670,7 @@
     return;
 
   media_source_opened_cb_.Run(new media::WebMediaSourceImpl(
-      chunk_demuxer_.get(),
-      base::Bind(&media::MediaLog::AddLogEvent, media_log_)));
+      chunk_demuxer_.get(), base::Bind(&AddLogEntry, media_log_)));
 }
 
 void MediaSourceDelegate::OnEncryptedMediaInitData(