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

media/base/android/media_source_player.h

 // Copyright (c) 2013 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_ANDROID_MEDIA_SOURCE_PLAYER_H_
 #define MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_
 
 #include <jni.h>
+
 #include <map>
+#include <memory>
 #include <string>
 #include <vector>
 
 #include "base/android/scoped_java_ref.h"
 #include "base/callback.h"
 #include "base/cancelable_callback.h"
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread.h"
 #include "base/time/default_tick_clock.h"
 #include "base/time/time.h"
 #include "media/base/android/demuxer_android.h"
 #include "media/base/android/media_codec_bridge.h"
 #include "media/base/android/media_decoder_job.h"
 #include "media/base/android/media_drm_bridge.h"
 #include "media/base/android/media_player_android.h"
 #include "media/base/android/media_statistics.h"
 #include "media/base/media_export.h"
 #include "media/base/time_delta_interpolator.h"
 
 namespace media {
 
 class AudioDecoderJob;
 class VideoDecoderJob;
 
 // This class handles media source extensions on Android. It uses Android
 // MediaCodec to decode audio and video streams in two separate threads.
 class MEDIA_EXPORT MediaSourcePlayer : public MediaPlayerAndroid,
                                        public DemuxerAndroidClient {
  public:
   // Constructs a player with the given ID and demuxer. |manager| must outlive
   // the lifetime of this object.
   MediaSourcePlayer(
       int player_id,
       MediaPlayerManager* manager,
       const OnDecoderResourcesReleasedCB& on_decoder_resources_released_cb,
-      scoped_ptr<DemuxerAndroid> demuxer,
+      std::unique_ptr<DemuxerAndroid> demuxer,
       const GURL& frame_url,
       int media_session_id);
   ~MediaSourcePlayer() override;
 
   // MediaPlayerAndroid implementation.
   void SetVideoSurface(gfx::ScopedJavaSurface surface) override;
   void Start() override;
   void Pause(bool is_media_related_action) override;
   void SeekTo(base::TimeDelta timestamp) override;
   void Release() override;
@@ skipping 128 matching lines @@
 
   static const char* GetEventName(PendingEventFlags event);
   bool IsEventPending(PendingEventFlags event) const;
   void SetPendingEvent(PendingEventFlags event);
   void ClearPendingEvent(PendingEventFlags event);
 
   // If the player is previously waiting for audio or video decoder job, retry
   // creating the decoders identified by |audio| and |video|.
   void RetryDecoderCreation(bool audio, bool video);
 
-  scoped_ptr<DemuxerAndroid> demuxer_;
+  std::unique_ptr<DemuxerAndroid> demuxer_;
 
   // Pending event that the player needs to do.
   unsigned pending_event_;
 
   // Stats about the media.
   base::TimeDelta duration_;
   bool playing_;
 
   // base::TickClock used by |interpolator_|.
   base::DefaultTickClock default_tick_clock_;
@@ skipping 18 matching lines @@
   bool doing_browser_seek_;
 
   // If already doing a browser seek when a regular seek request arrives,
   // these fields remember the regular seek so OnDemuxerSeekDone() can trigger
   // it when the browser seek is done. These are only valid when
   // |SEEK_EVENT_PENDING| is pending.
   bool pending_seek_;
   base::TimeDelta pending_seek_time_;
 
   // Decoder jobs.
-  scoped_ptr<AudioDecoderJob, MediaDecoderJob::Deleter> audio_decoder_job_;
-  scoped_ptr<VideoDecoderJob, MediaDecoderJob::Deleter> video_decoder_job_;
+  std::unique_ptr<AudioDecoderJob, MediaDecoderJob::Deleter> audio_decoder_job_;
+  std::unique_ptr<VideoDecoderJob, MediaDecoderJob::Deleter> video_decoder_job_;
 
   // Track the most recent preroll target. Decoder re-creation needs this to
   // resume any in-progress preroll.
   base::TimeDelta preroll_timestamp_;
 
   // A cancelable task that is posted when the audio decoder starts requesting
   // new data. This callback runs if no data arrives before the timeout period
   // elapses.
   base::CancelableClosure decoder_starvation_callback_;
 
@@ skipping 20 matching lines @@
   bool is_waiting_for_video_decoder_;
 
   // Test-only callback for hooking the completion of the next decode cycle.
   base::Closure decode_callback_for_testing_;
 
   // Whether audio or video decoder is in the process of prerolling.
   bool prerolling_;
 
   // Gathers and reports playback quality statistics to UMA.
   // Use pointer to enable replacement of this object for tests.
-  scoped_ptr<MediaStatistics> media_stat_;
+  std::unique_ptr<MediaStatistics> media_stat_;
 
   // Weak pointer passed to media decoder jobs for callbacks.
   base::WeakPtr<MediaSourcePlayer> weak_this_;
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<MediaSourcePlayer> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaSourcePlayer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_