Remove locking from FFmpegDemuxerStream and associated TODOs from media code.

media/filters/decrypting_video_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_VIDEO_DECODER_H_
 #define MEDIA_FILTERS_DECRYPTING_VIDEO_DECODER_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "media/base/decryptor.h"
@@ skipping 76 matching lines @@
 
   // Callback for Decryptor::InitializeVideoDecoder().
   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::DecryptAndDecodeVideo().
   void DeliverFrame(int buffer_size,
                     Decryptor::Status status,
                     const scoped_refptr<VideoFrame>& frame);
 
@@ skipping 45 matching lines @@
   // A unique ID to trace Decryptor::DecryptAndDecodeVideo() call and the
   // matching DecryptCB call (in DoDeliverFrame()).
   uint32 trace_id_;
 
   DISALLOW_COPY_AND_ASSIGN(DecryptingVideoDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_DECRYPTING_VIDEO_DECODER_H_