Remove locking from FFmpegDemuxerStream and associated TODOs from media code.

media/filters/ffmpeg_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_FFMPEG_VIDEO_DECODER_H_
 #define MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "media/base/decryptor.h"
@@ skipping 38 matching lines @@
   enum DecoderState {
     kUninitialized,
     kNormal,
     kFlushCodec,
     kDecodeFinished
   };
 
   // Carries out the reading operation scheduled by Read().
   void DoRead(const ReadCB& read_cb);
 
-  // Reads from the demuxer stream with corresponding callback method.
+  // Reads from the demuxer stream.
   void ReadFromDemuxerStream();
-  void DecryptOrDecodeBuffer(DemuxerStream::Status status,
-                             const scoped_refptr<DecoderBuffer>& buffer);
 
   // Carries out the buffer processing operation scheduled by
   // DecryptOrDecodeBuffer().
   void DoDecryptOrDecodeBuffer(DemuxerStream::Status status,
                                const scoped_refptr<DecoderBuffer>& buffer);
 
   // Callback called by the decryptor to deliver decrypted data buffer and
   // reporting decrypt status. This callback could be called synchronously or
   // asynchronously.
   void BufferDecrypted(Decryptor::Status decrypt_status,
@@ skipping 38 matching lines @@
   scoped_refptr<DemuxerStream> demuxer_stream_;
 
   Decryptor* decryptor_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_