Replace scoped_ptr with std::unique_ptr in //media/base.

media/base/stream_parser.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_BASE_STREAM_PARSER_H_
 #define MEDIA_BASE_STREAM_PARSER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <deque>
 #include <map>
+#include <memory>
 #include <string>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "media/base/demuxer_stream.h"
 #include "media/base/eme_constants.h"
 #include "media/base/media_export.h"
 #include "media/base/media_log.h"
 
 namespace media {
 
 class MediaTracks;
 class StreamParserBuffer;
 class TextTrackConfig;
 
 // Abstract interface for parsing media byte streams.
 class MEDIA_EXPORT StreamParser {
  public:
-  typedef std::deque<scoped_refptr<StreamParserBuffer> > BufferQueue;
+  using BufferQueue = std::deque<scoped_refptr<StreamParserBuffer>>;
 
   // Range of |TrackId| is dependent upon stream parsers. It is currently
   // the key for the buffer's text track config in the applicable
   // TextTrackConfigMap (which is passed in StreamParser::NewConfigCB), or
   // 0 for other media types that currently allow at most one track.
   // WebMTracksParser uses -1 as an invalid text track number.
   // TODO(wolenetz/acolwell): Change to size_type while fixing stream parsers to
   // emit validated track configuration and buffer vectors rather than max 1
   // audio, max 1 video, and N text tracks in a map keyed by
   // bytestream-specific-ranged track numbers. See http://crbug.com/341581.
@@ skipping 36 matching lines @@
 
   // Indicates when new stream configurations have been parsed.
   // First parameter - An object containing information about media tracks as
   //                   well as audio/video decoder configs associated with each
   //                   track the parser will use from the stream.
   // Second parameter - The new text tracks configuration.  If the map is empty,
   //                    then no text tracks were parsed for use from the stream.
   // Return value - True if the new configurations are accepted.
   //                False if the new configurations are not supported
   //                and indicates that a parsing error should be signalled.
-  typedef base::Callback<bool(scoped_ptr<MediaTracks>,
+  typedef base::Callback<bool(std::unique_ptr<MediaTracks>,
                               const TextTrackConfigMap&)>
       NewConfigCB;
 
   // New stream buffers have been parsed.
   // First parameter - A queue of newly parsed audio buffers.
   // Second parameter - A queue of newly parsed video buffers.
   // Third parameter - A map of text track ids to queues of newly parsed inband
   //                   text buffers. If the map is not empty, it must contain
   //                   at least one track with a non-empty queue of text
   //                   buffers.
@@ skipping 63 matching lines @@
 // subtle issues with tie-breaking. See http://crbug.com/338484.
 MEDIA_EXPORT bool MergeBufferQueues(
     const StreamParser::BufferQueue& audio_buffers,
     const StreamParser::BufferQueue& video_buffers,
     const StreamParser::TextBufferQueueMap& text_buffers,
     StreamParser::BufferQueue* merged_buffers);
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_STREAM_PARSER_H_