chromecast/media/cma/backend/media_pipeline_backend_default.h - Issue 1875623002: Convert //chromecast from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chromecast/media/cma/backend/media_pipeline_backend_default.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

« no previous file with comments | « chromecast/media/cma/backend/audio_video_pipeline_device_unittest.cc ('k') | chromecast/media/cma/backend/media_pipeline_backend_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chromecast/media/cma/backend/media_pipeline_backend_default.h

diff --git a/chromecast/media/cma/backend/media_pipeline_backend_default.h b/chromecast/media/cma/backend/media_pipeline_backend_default.h

index 322a53b218fcc4b63d028e9b0021386a720b978f..36a156e6706c0d8ffac58ab4d86e86e62d57e30c 100644

--- a/chromecast/media/cma/backend/media_pipeline_backend_default.h

+++ b/chromecast/media/cma/backend/media_pipeline_backend_default.h

@@ -7,8 +7,9 @@

#include <stdint.h>

+#include <memory>

#include "base/macros.h"

-#include "base/memory/scoped_ptr.h"

#include "base/time/time.h"

#include "chromecast/public/media/media_pipeline_backend.h"

@@ -48,8 +49,8 @@ class MediaPipelineBackendDefault : public MediaPipelineBackend {

bool running_;

float rate_;

- scoped_ptr<AudioDecoderDefault> audio_decoder_;

- scoped_ptr<VideoDecoderDefault> video_decoder_;

+ std::unique_ptr<AudioDecoderDefault> audio_decoder_;

+ std::unique_ptr<VideoDecoderDefault> video_decoder_;

DISALLOW_COPY_AND_ASSIGN(MediaPipelineBackendDefault);

};