Merge from Chromium at DEPS revision 261286

This commit was generated by merge_to_master.py.

Change-Id: Iea9643ce91618057f128e9a5b62c07be152f2b89

1 files changed, 0 insertions, 5 deletions

diff --git a/media/filters/decoder_stream.h b/media/filters/decoder_stream.h
index cc44885bd8..2fd2a552d2 100644
--- a/media/filters/decoder_stream.h
+++ b/media/filters/decoder_stream.h
@@ -87,10 +87,6 @@ class MEDIA_EXPORT DecoderStream {
   // behavior.
   bool CanReadWithoutStalling() const;
 
-  // TODO(rileya): Remove this once channel_layout/bits_per_channel/etc getters
-  // have been removed from AudioDecoder and plumbed elsewhere.
-  Decoder* decoder() { return decoder_.get(); }
-
   // Allows callers to register for notification of splice buffers from the
   // demuxer.  I.e., DecoderBuffer::splice_timestamp() is not kNoTimestamp().
   typedef base::Callback<void(base::TimeDelta)> SpliceObserverCB;
@@ -161,7 +157,6 @@ class MEDIA_EXPORT DecoderStream {
   void OnDecoderReset();
 
   void StopDecoder();
-  void OnDecoderStopped();
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;