media/base/android/media_drm_bridge_cdm_context.h - Issue 1906423005: Replace scoped_ptr with std::unique_ptr in //media/base.

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: media/base/android/media_drm_bridge_cdm_context.h

Issue 1906423005: Replace scoped_ptr with std::unique_ptr in //media/base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: scopedptr-media-base: . 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: media/base/android/media_drm_bridge_cdm_context.h

diff --git a/media/base/android/media_drm_bridge_cdm_context.h b/media/base/android/media_drm_bridge_cdm_context.h

index de76c5ec3b65ff4011c62d315edc119e62b44ac6..c11cc413fa7e6f9ea53ddf30b975e657c0484e74 100644

--- a/media/base/android/media_drm_bridge_cdm_context.h

+++ b/media/base/android/media_drm_bridge_cdm_context.h

@@ -7,10 +7,11 @@

#include <jni.h>

+#include <memory>

#include "base/android/scoped_java_ref.h"

#include "base/callback.h"

#include "base/macros.h"

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

#include "media/base/cdm_context.h"

#include "media/base/media_export.h"

#include "media/base/player_tracker.h"

@@ -32,7 +33,8 @@ class MediaDrmBridge;

class MEDIA_EXPORT MediaDrmBridgeCdmContext : public CdmContext,

public PlayerTracker {

public:

- using JavaObjectPtr = scoped_ptr<base::android::ScopedJavaGlobalRef<jobject>>;

+ using JavaObjectPtr =

+ std::unique_ptr<base::android::ScopedJavaGlobalRef<jobject>>;

// Notification called when MediaCrypto object is ready.

// Parameters:

« no previous file with comments | « media/base/android/media_drm_bridge.cc ('k') | media/base/android/media_drm_bridge_unittest.cc » ('j') | media/base/audio_renderer_mixer.h » ('J')