Replace VideoRendererBase Get/PutCurrentFrame() with a VideoFrame-containing callback.

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"
@@ skipping 65 matching lines @@
   XSelectInput(g_display, g_window,
                ExposureMask | ButtonPressMask | KeyPressMask);
   XMapWindow(g_display, g_window);
   return true;
 }
 
 void SetOpaque(bool /*opaque*/) {
 }
 
 typedef base::Callback<void(media::VideoFrame*)> PaintCB;
-void Paint(MessageLoop* message_loop, const PaintCB& paint_cb) {
+void Paint(MessageLoop* message_loop, const PaintCB& paint_cb,
+           const scoped_refptr<media::VideoFrame>& video_frame) {
   if (message_loop != MessageLoop::current()) {
     message_loop->PostTask(FROM_HERE, base::Bind(
-        &Paint, message_loop, paint_cb));
+        &Paint, message_loop, paint_cb, video_frame));
     return;
   }
 
-  scoped_refptr<media::VideoFrame> video_frame;
-  g_video_renderer->GetCurrentFrame(&video_frame);

[acolwell GONE FROM CHROMIUM, 2013/02/01 00:24:34]

I think g_video_renderer can go away now. 

Perhaps even this whole file. ;)

[scherkus (not reviewing), 2013/02/01 22:45:25]

Done.

-  if (video_frame)
-    paint_cb.Run(video_frame);
-  g_video_renderer->PutCurrentFrame(video_frame);
+  paint_cb.Run(video_frame);
 }
 
 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,
@@ skipping 186 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;
 }