chromecast/media/cma/decoder/cast_audio_decoder.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/decoder/cast_audio_decoder.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/base/multi_demuxer_stream_adapter_unittest.cc ('k') | chromecast/media/cma/decoder/cast_audio_decoder_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chromecast/media/cma/decoder/cast_audio_decoder.h

diff --git a/chromecast/media/cma/decoder/cast_audio_decoder.h b/chromecast/media/cma/decoder/cast_audio_decoder.h

index f6515316c4cc5971d4c72c8539fdc3a8a9287846..3a1bd5e3773bd714a4170fb43f1f905fd17c3bfb 100644

--- a/chromecast/media/cma/decoder/cast_audio_decoder.h

+++ b/chromecast/media/cma/decoder/cast_audio_decoder.h

@@ -5,10 +5,11 @@

#ifndef CHROMECAST_MEDIA_CMA_DECODER_CAST_AUDIO_DECODER_H_

#define CHROMECAST_MEDIA_CMA_DECODER_CAST_AUDIO_DECODER_H_

+#include <memory>

#include "base/callback.h"

#include "base/macros.h"

#include "base/memory/ref_counted.h"

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

namespace base {

class SingleThreadTaskRunner;

@@ -43,7 +44,7 @@ class CastAudioDecoder {

// Creates a CastAudioDecoder instance for the given |config|. Decoding must

// occur on the same thread as |task_runner|. Returns an empty scoped_ptr if

// the decoder could not be created.

- static scoped_ptr<CastAudioDecoder> Create(

+ static std::unique_ptr<CastAudioDecoder> Create(

const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,

const media::AudioConfig& config,

OutputFormat output_format,