Convert //media/filters from scoped_ptr to std::unique_ptr

media/filters/decoder_stream.h

 // Copyright 2014 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_DECODER_STREAM_H_
 #define MEDIA_FILTERS_DECODER_STREAM_H_
 
 #include <list>
 

[ddorwin, 2016/04/21 22:54:54]

<memory>?

 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "media/base/audio_decoder.h"
 #include "media/base/demuxer_stream.h"
 #include "media/base/media_export.h"
 #include "media/base/media_log.h"
 #include "media/base/moving_average.h"
@@ skipping 113 matching lines @@
     STATE_END_OF_STREAM,  // End of stream reached; returns EOS on all reads.
     STATE_ERROR
   };
 
   void SelectDecoder(CdmContext* cdm_context);
 
   // Called when |decoder_selector| selected the |selected_decoder|.
   // |decrypting_demuxer_stream| was also populated if a DecryptingDemuxerStream
   // is created to help decrypt the encrypted stream.
   void OnDecoderSelected(
-      scoped_ptr<Decoder> selected_decoder,
-      scoped_ptr<DecryptingDemuxerStream> decrypting_demuxer_stream);
+      std::unique_ptr<Decoder> selected_decoder,
+      std::unique_ptr<DecryptingDemuxerStream> decrypting_demuxer_stream);
 
   // Satisfy pending |read_cb_| with |status| and |output|.
   void SatisfyRead(Status status,
                    const scoped_refptr<Output>& output);
 
   // Decodes |buffer| and returns the result via OnDecodeOutputReady().
   void Decode(const scoped_refptr<DecoderBuffer>& buffer);
 
   // Flushes the decoder with an EOS buffer to retrieve internally buffered
   // decoder output.
@@ skipping 30 matching lines @@
 
   StatisticsCB statistics_cb_;
   InitCB init_cb_;
   base::Closure waiting_for_decryption_key_cb_;
 
   ReadCB read_cb_;
   base::Closure reset_cb_;
 
   DemuxerStream* stream_;
 
-  scoped_ptr<DecoderSelector<StreamType> > decoder_selector_;
+  std::unique_ptr<DecoderSelector<StreamType>> decoder_selector_;
 
-  scoped_ptr<Decoder> decoder_;
+  std::unique_ptr<Decoder> decoder_;
   // When falling back from H/W decoding to S/W decoding, destructing the
   // GpuVideoDecoder too early results in black frames being displayed.
   // |previous_decoder_| is used to keep it alive.  It is destroyed once we've
   // decoded at least media::limits::kMaxVideoFrames frames after fallback.
   int decoded_frames_since_fallback_;
-  scoped_ptr<Decoder> previous_decoder_;
-  scoped_ptr<DecryptingDemuxerStream> decrypting_demuxer_stream_;
+  std::unique_ptr<Decoder> previous_decoder_;
+  std::unique_ptr<DecryptingDemuxerStream> decrypting_demuxer_stream_;
 
   SpliceObserverCB splice_observer_cb_;
   ConfigChangeObserverCB config_change_observer_cb_;
 
   // If a splice_timestamp() has been seen, this is true until a
   // splice_timestamp() of kNoTimestamp() is encountered.
   bool active_splice_;
 
   // An end-of-stream buffer has been sent for decoding, no more buffers should
   // be sent for decoding until it completes.
@@ skipping 19 matching lines @@
 
 template <>
 int DecoderStream<DemuxerStream::AUDIO>::GetMaxDecodeRequests() const;
 
 typedef DecoderStream<DemuxerStream::VIDEO> VideoFrameStream;
 typedef DecoderStream<DemuxerStream::AUDIO> AudioBufferStream;
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_DECODER_STREAM_H_