Merge r104540 into 874 (m15).

media/filters/video_renderer_base.cc

Index: media/filters/video_renderer_base.cc
===================================================================
--- media/filters/video_renderer_base.cc	(revision 105911)
+++ media/filters/video_renderer_base.cc	(working copy)
@@ -39,7 +39,7 @@
 
 VideoRendererBase::~VideoRendererBase() {
   base::AutoLock auto_lock(lock_);
-  DCHECK(state_ == kUninitialized || state_ == kStopped);
+  DCHECK(state_ == kUninitialized || state_ == kStopped) << state_;
 }
 
 void VideoRendererBase::Play(FilterCallback* callback) {
@@ -97,7 +97,7 @@
   playback_rate_ = playback_rate;
 }
 
-void VideoRendererBase::Seek(base::TimeDelta time, const FilterStatusCB&  cb) {
+void VideoRendererBase::Seek(base::TimeDelta time, const FilterStatusCB& cb) {
   bool run_callback = false;
 
   {
@@ -114,7 +114,6 @@
     if (state_ == kPrerolled) {
       // Already get enough buffers from decoder.
       run_callback = true;
-
     } else {
       // Otherwise we are either kFlushed or kSeeking, but without enough
       // buffers we should save the callback function and call it later.