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

media/filters/decoder_selector.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_SELECTOR_H_
 #define MEDIA_FILTERS_DECODER_SELECTOR_H_
 
+#include <memory>
+
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "build/build_config.h"
 #include "media/base/demuxer_stream.h"
 #include "media/base/pipeline_status.h"
 #include "media/filters/decoder_stream_traits.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
@@ skipping 18 matching lines @@
 
   // Indicates completion of Decoder selection.
   // - First parameter: The initialized Decoder. If it's set to NULL, then
   // Decoder initialization failed.
   // - Second parameter: The initialized DecryptingDemuxerStream. If it's not
   // NULL, then a DecryptingDemuxerStream is created and initialized to do
   // decryption for the initialized Decoder.
   // Note: The caller owns selected Decoder and DecryptingDemuxerStream.
   // The caller should call DecryptingDemuxerStream::Reset() before
   // calling Decoder::Reset() to release any pending decryption or read.
-  typedef base::Callback<
-      void(scoped_ptr<Decoder>,
-           scoped_ptr<DecryptingDemuxerStream>)>
+  typedef base::Callback<void(std::unique_ptr<Decoder>,
+                              std::unique_ptr<DecryptingDemuxerStream>)>
       SelectDecoderCB;
 
   // |decoders| contains the Decoders to use when initializing.
   DecoderSelector(
       const scoped_refptr<base::SingleThreadTaskRunner>& message_loop,
       ScopedVector<Decoder> decoders,
       const scoped_refptr<MediaLog>& media_log);
 
   // Aborts pending Decoder selection and fires |select_decoder_cb| with
   // NULL and NULL immediately if it's pending.
@@ skipping 28 matching lines @@
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
   ScopedVector<Decoder> decoders_;
   scoped_refptr<MediaLog> media_log_;
 
   DemuxerStream* input_stream_;
   CdmContext* cdm_context_;
   SelectDecoderCB select_decoder_cb_;
   typename Decoder::OutputCB output_cb_;
   base::Closure waiting_for_decryption_key_cb_;
 
-  scoped_ptr<Decoder> decoder_;
-  scoped_ptr<DecryptingDemuxerStream> decrypted_stream_;
+  std::unique_ptr<Decoder> decoder_;
+  std::unique_ptr<DecryptingDemuxerStream> decrypted_stream_;
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<DecoderSelector> weak_ptr_factory_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(DecoderSelector);
 };
 
 typedef DecoderSelector<DemuxerStream::VIDEO> VideoDecoderSelector;
 typedef DecoderSelector<DemuxerStream::AUDIO> AudioDecoderSelector;
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_DECODER_SELECTOR_H_