media/base/android/media_player_android.cc - Issue 1407933010: media: Make MediaKeys ref-counted.

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_player_android.cc

Issue 1407933010: media: Make MediaKeys ref-counted. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: comments addressed Created 5 years, 2 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:

Index: media/base/android/media_player_android.cc

diff --git a/media/base/android/media_player_android.cc b/media/base/android/media_player_android.cc

index c08c259420abe09527515d48d99dce47a7f06403..9bde3dedbd01e746678d4418cbe70428d64029de 100644

--- a/media/base/android/media_player_android.cc

+++ b/media/base/android/media_player_android.cc

@@ -42,7 +42,7 @@ GURL MediaPlayerAndroid::GetFirstPartyForCookies() {

return GURL();

}

-void MediaPlayerAndroid::SetCdm(BrowserCdm* /* cdm */) {

+void MediaPlayerAndroid::SetCdm(const scoped_refptr<MediaKeys>& /* cdm */) {

// Players that support EME should override this.

LOG(ERROR) << "EME not supported on base MediaPlayerAndroid class.";

return;