Remove locking from FFmpegDemuxerStream and associated TODOs from media code.

media/filters/decrypting_audio_decoder.h

 // 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.
 
 #ifndef MEDIA_FILTERS_DECRYPTING_AUDIO_DECODER_H_
 #define MEDIA_FILTERS_DECRYPTING_AUDIO_DECODER_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "media/base/audio_decoder.h"
@@ skipping 78 matching lines @@
 
   // Callback for Decryptor::InitializeAudioDecoder().
   void FinishInitialization(bool success);
 
   // Carries out the buffer reading operation scheduled by Read().
   void DoRead(const ReadCB& read_cb);
 
   void ReadFromDemuxerStream();
 
   // Callback for DemuxerStream::Read().
-  void DecryptAndDecodeBuffer(DemuxerStream::Status status,
-                              const scoped_refptr<DecoderBuffer>& buffer);
-
-  // Carries out the buffer decrypting/decoding operation scheduled by
-  // DecryptAndDecodeBuffer().
   void DoDecryptAndDecodeBuffer(DemuxerStream::Status status,
                                 const scoped_refptr<DecoderBuffer>& buffer);
 
   void DecodePendingBuffer();
 
   // Callback for Decryptor::DecryptAndDecodeAudio().
   void DeliverFrame(int buffer_size,
                     Decryptor::Status status,
                     const Decryptor::AudioBuffers& frames);
 
@@ skipping 57 matching lines @@
 
   base::TimeDelta output_timestamp_base_;
   int total_samples_decoded_;
 
   DISALLOW_COPY_AND_ASSIGN(DecryptingAudioDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_DECRYPTING_AUDIO_DECODER_H_