Revert "Removes MediaDecoderJob virtual method call from destructor."

media/base/android/media_decoder_job.cc

 // Copyright 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/base/android/media_decoder_job.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/debug/trace_event.h"
 #include "base/message_loop/message_loop_proxy.h"
@@ skipping 30 matching lines @@
       is_requesting_demuxer_data_(false),
       is_incoming_data_invalid_(false),
       release_resources_pending_(false),
       drm_bridge_(NULL),
       drain_decoder_(false) {
   InitializeReceivedData();
   eos_unit_.end_of_stream = true;
 }
 
 MediaDecoderJob::~MediaDecoderJob() {
-  DCHECK(!media_codec_bridge_);
+  ReleaseMediaCodecBridge();
 }
 
 void MediaDecoderJob::OnDataReceived(const DemuxerData& data) {
   DVLOG(1) << __FUNCTION__ << ": " << data.access_units.size() << " units";
   DCHECK(ui_task_runner_->BelongsToCurrentThread());
   DCHECK(NoAccessUnitsRemainingInChunk(false));
 
   TRACE_EVENT_ASYNC_END2(
       "media", "MediaDecoderJob::RequestData", this,
       "Data type", data.type == media::DemuxerStream::AUDIO ? "AUDIO" : "VIDEO",
@@ skipping 163 matching lines @@
 
   request_data_cb_.Reset();
   data_received_cb_.Reset();
   decode_cb_.Reset();
 
   if (destroy_pending_) {
     DVLOG(1) << __FUNCTION__ << " : delete is pending decode completion";
     return;
   }
 
-  ReleaseMediaCodecBridge();
   delete this;
 }
 
 MediaCodecStatus MediaDecoderJob::QueueInputBuffer(const AccessUnit& unit) {
   DVLOG(1) << __FUNCTION__;
   DCHECK(decoder_task_runner_->BelongsToCurrentThread());
   TRACE_EVENT0("media", __FUNCTION__);
 
   int input_buf_index = input_buf_index_;
   input_buf_index_ = -1;
@@ skipping 248 matching lines @@
                       completion_callback);
 }
 
 void MediaDecoderJob::OnDecodeCompleted(
     MediaCodecStatus status, base::TimeDelta current_presentation_timestamp,
     base::TimeDelta max_presentation_timestamp) {
   DCHECK(ui_task_runner_->BelongsToCurrentThread());
 
   if (destroy_pending_) {
     DVLOG(1) << __FUNCTION__ << " : completing pending deletion";
-    ReleaseMediaCodecBridge();
     delete this;
     return;
   }
 
   if (status == MEDIA_CODEC_OUTPUT_END_OF_STREAM)
     output_eos_encountered_ = true;
 
   DCHECK(!decode_cb_.is_null());
 
   // If output was queued for rendering, then we have completed prerolling.
@@ skipping 132 matching lines @@
 
 void MediaDecoderJob::ReleaseMediaCodecBridge() {
   if (!media_codec_bridge_)
     return;
 
   media_codec_bridge_.reset();
   input_buf_index_ = -1;
 }
 
 }  // namespace media