Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3427)

Unified Diff: chromecast/media/cma/pipeline/av_pipeline_impl.h

Issue 1875623002: Convert //chromecast from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chromecast/media/cma/pipeline/av_pipeline_impl.h
diff --git a/chromecast/media/cma/pipeline/av_pipeline_impl.h b/chromecast/media/cma/pipeline/av_pipeline_impl.h
index ad44026edaac46737ed7d33eb9e5f6e5f2c4702d..1ceb0ebb8f173405e2fd4d04563476fd4ff2f08d 100644
--- a/chromecast/media/cma/pipeline/av_pipeline_impl.h
+++ b/chromecast/media/cma/pipeline/av_pipeline_impl.h
@@ -9,12 +9,12 @@
#include <stdint.h>
#include <list>
+#include <memory>
#include <string>
#include "base/callback.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/thread_checker.h"
#include "chromecast/media/cma/pipeline/av_pipeline_client.h"
@@ -79,7 +79,7 @@ class AvPipelineImpl : MediaPipelineBackend::Decoder::Delegate {
const ::media::VideoDecoderConfig& video_config) = 0;
// Setting the frame provider must be done in the |kUninitialized| state.
- void SetCodedFrameProvider(scoped_ptr<CodedFrameProvider> frame_provider,
+ void SetCodedFrameProvider(std::unique_ptr<CodedFrameProvider> frame_provider,
size_t max_buffer_size,
size_t max_frame_size);
@@ -151,7 +151,7 @@ class AvPipelineImpl : MediaPipelineBackend::Decoder::Delegate {
std::list<scoped_refptr<DecoderBufferBase> > non_playable_frames_;
// Buffer provider.
- scoped_ptr<BufferingFrameProvider> frame_provider_;
+ std::unique_ptr<BufferingFrameProvider> frame_provider_;
// Indicate whether the frame fetching process is active.
bool enable_feeding_;
« no previous file with comments | « chromecast/media/cma/pipeline/audio_video_pipeline_impl_unittest.cc ('k') | chromecast/media/cma/pipeline/av_pipeline_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698