Vanquish the remnants of media::MessageLoopFactory.

media/tools/player_x11/player_x11.cc

 // Copyright (c) 2012 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 <signal.h>
 
 #include <iostream>  // NOLINT
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/thread.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/null_audio_sink.h"
 #include "media/base/filter_collection.h"
 #include "media/base/media.h"
 #include "media/base/media_log.h"
 #include "media/base/media_switches.h"
-#include "media/base/message_loop_factory.h"
 #include "media/base/pipeline.h"
 #include "media/base/video_frame.h"
 #include "media/filters/audio_renderer_impl.h"
 #include "media/filters/ffmpeg_audio_decoder.h"
 #include "media/filters/ffmpeg_demuxer.h"
 #include "media/filters/ffmpeg_video_decoder.h"
 #include "media/filters/file_data_source.h"
 #include "media/filters/video_renderer_base.h"
 #include "media/tools/player_x11/data_source_logger.h"
 
@@ skipping 66 matching lines @@
 
 static void OnBufferingState(media::Pipeline::BufferingState buffering_state) {}
 
 // TODO(vrk): Re-enabled audio. (crbug.com/112159)
 bool InitPipeline(const scoped_refptr<base::MessageLoopProxy>& message_loop,
                   const scoped_refptr<media::DataSource>& data_source,
                   const PaintCB& paint_cb,
                   bool /* enable_audio */,
                   scoped_refptr<media::Pipeline>* pipeline,
                   MessageLoop* paint_message_loop,
                   media::MessageLoopFactory* message_loop_factory) {

[acolwell GONE FROM CHROMIUM, 2012/12/10 18:12:16]

What about this?

   // Create our filter factories.
   scoped_ptr<media::FilterCollection> collection(
       new media::FilterCollection());
   collection->SetDemuxer(new media::FFmpegDemuxer(message_loop, data_source));
   collection->GetAudioDecoders()->push_back(new media::FFmpegAudioDecoder(
       message_loop));
   collection->GetVideoDecoders()->push_back(new media::FFmpegVideoDecoder(
       message_loop, NULL));
 
   // Create our video renderer and save a reference to it for painting.
@@ skipping 129 matching lines @@
 
   // Install the signal handler.
   signal(SIGTERM, &TerminateHandler);
   signal(SIGINT, &TerminateHandler);
 
   // Initialize X11.
   if (!InitX11())
     return 1;
 
   // Initialize the pipeline thread and the pipeline.
   scoped_ptr<media::MessageLoopFactory> message_loop_factory(

[acolwell GONE FROM CHROMIUM, 2012/12/10 18:12:16]

ditto

       new media::MessageLoopFactory());
   scoped_ptr<base::Thread> thread;
   scoped_refptr<media::Pipeline> pipeline;
   MessageLoop message_loop;
   thread.reset(new base::Thread("PipelineThread"));
   thread->Start();
 
   PaintCB paint_cb;
   if (command_line->HasSwitch("use-gl")) {
     paint_cb = base::Bind(
@@ skipping 28 matching lines @@
   // Release callback which releases video renderer. Do this before cleaning up
   // X below since the video renderer has some X cleanup duties as well.
   paint_cb.Reset();
 
   XDestroyWindow(g_display, g_window);
   XCloseDisplay(g_display);
   g_audio_manager = NULL;
 
   return 0;
 }