Make VideoDecoder use (kAborted, NULL) to signify an aborted decode, instead of (kOk, NULL).

media/filters/video_frame_stream.cc

 // Copyright (c) 2013 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/filters/video_frame_stream.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/debug/trace_event.h"
 #include "base/location.h"
@@ skipping 227 matching lines @@
   Decode(DecoderBuffer::CreateEOSBuffer());
 }
 
 void VideoFrameStream::OnFrameReady(int buffer_size,
                                     const VideoDecoder::Status status,
                                     const scoped_refptr<VideoFrame>& frame) {
   DVLOG(2) << __FUNCTION__;
   DCHECK(state_ == STATE_NORMAL || state_ == STATE_FLUSHING_DECODER) << state_;
   DCHECK(!read_cb_.is_null());
   DCHECK(stop_cb_.is_null());
+  DCHECK_EQ(status == VideoDecoder::kOk, frame != NULL);
 
   TRACE_EVENT_ASYNC_END0("media", "VideoFrameStream::Decode", this);
 
   if (status == VideoDecoder::kDecodeError) {
-    DCHECK(!frame.get());
     state_ = STATE_ERROR;
     SatisfyRead(DECODE_ERROR, NULL);
     return;
   }
 
   if (status == VideoDecoder::kDecryptError) {
-    DCHECK(!frame.get());
     state_ = STATE_ERROR;
     SatisfyRead(DECRYPT_ERROR, NULL);
     return;
   }
 
   // Any successful decode counts!
   if (buffer_size > 0) {
     PipelineStatistics statistics;
     statistics.video_bytes_decoded = buffer_size;
     statistics_cb_.Run(statistics);
@@ skipping 176 matching lines @@
   DCHECK(!stop_cb_.is_null());
 
   state_ = STATE_STOPPED;
   stream_ = NULL;
   decoder_.reset();
   decrypting_demuxer_stream_.reset();
   base::ResetAndReturn(&stop_cb_).Run();
 }
 
 }  // namespace media