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

media/renderers/default_renderer_factory.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/renderers/default_renderer_factory.h"
 
 #include "base/bind.h"
 #include "base/single_thread_task_runner.h"
 #if !defined(MEDIA_DISABLE_FFMPEG)
 #include "media/base/media_log.h"
 #include "media/filters/ffmpeg_audio_decoder.h"
 #include "media/filters/ffmpeg_video_decoder.h"
 #endif
 #include "media/filters/gpu_video_decoder.h"
 #include "media/filters/opus_audio_decoder.h"
 #include "media/renderers/audio_renderer_impl.h"
 #include "media/renderers/gpu_video_accelerator_factories.h"
 #include "media/renderers/renderer_impl.h"
 #include "media/renderers/video_renderer_impl.h"
 #if !defined(MEDIA_DISABLE_LIBVPX)
 #include "media/filters/vpx_video_decoder.h"
 #endif
 
 namespace media {
 
+#if !defined(MEDIA_DISABLE_FFMPEG)
+
+static void AddLogEntry(const scoped_refptr<MediaLog>& media_log,
+                        MediaLog::MediaLogLevel level,
+                        const std::string& message) {
+  media_log->AddEvent(media_log->CreateLogEvent(level, message));
+}
+#endif
+
 DefaultRendererFactory::DefaultRendererFactory(
     const scoped_refptr<MediaLog>& media_log,
     const scoped_refptr<GpuVideoAcceleratorFactories>& gpu_factories,
     const AudioHardwareConfig& audio_hardware_config)
     : media_log_(media_log),
       gpu_factories_(gpu_factories),
       audio_hardware_config_(audio_hardware_config) {
 }
 
 DefaultRendererFactory::~DefaultRendererFactory() {
 }
 
 // TODO(xhwang): Use RendererConfig to customize what decoders we use.
 scoped_ptr<Renderer> DefaultRendererFactory::CreateRenderer(
     const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
     AudioRendererSink* audio_renderer_sink) {
   DCHECK(audio_renderer_sink);
 
   // Create our audio decoders and renderer.
   ScopedVector<AudioDecoder> audio_decoders;
 
 #if !defined(MEDIA_DISABLE_FFMPEG)
   audio_decoders.push_back(new FFmpegAudioDecoder(
-      media_task_runner, base::Bind(&MediaLog::AddLogEvent, media_log_)));
+      media_task_runner, base::Bind(&AddLogEntry, media_log_)));
 #endif
 
   audio_decoders.push_back(new OpusAudioDecoder(media_task_runner));
 
   scoped_ptr<AudioRenderer> audio_renderer(new AudioRendererImpl(
       media_task_runner, audio_renderer_sink, audio_decoders.Pass(),
       audio_hardware_config_, media_log_));
 
   // Create our video decoders and renderer.
   ScopedVector<VideoDecoder> video_decoders;
@@ skipping 17 matching lines @@
 
   scoped_ptr<VideoRenderer> video_renderer(new VideoRendererImpl(
       media_task_runner, video_decoders.Pass(), true, media_log_));
 
   // Create renderer.
   return scoped_ptr<Renderer>(new RendererImpl(
       media_task_runner, audio_renderer.Pass(), video_renderer.Pass()));
 }
 
 }  // namespace media