media/base/android/media_drm_bridge_unittest.cc - Issue 1341883003: Prepare MediaDrmBridge to work with MediaCodecPlayer

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

Issue 1341883003: Prepare MediaDrmBridge to work with MediaCodecPlayer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bug526755

Patch Set: Removed lock from player_tracker_impl Created 5 years, 3 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

« content/browser/media/cdm/browser_cdm_manager.cc ('K') | « media/base/android/media_drm_bridge.cc ('k') | media/base/android/media_drm_proxy.h » ('j') | media/base/android/media_drm_proxy.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/base/android/media_drm_bridge_unittest.cc

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

index e4c0800030a57af1cb9aa1ceef1655cfcc3c8c5d..4598663620b674cb343c9969d4dd7558673eb768 100644

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

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

@@ -86,7 +86,7 @@ TEST(MediaDrmBridgeTest, CreateWithoutSessionSupport_InvalidKeySystem) {

}

TEST(MediaDrmBridgeTest, SetSecurityLevel_Widevine) {

- scoped_ptr<MediaDrmBridge> media_drm_bridge =

+ scoped_ptr<MediaDrmBridge, BrowserCdmDeleter> media_drm_bridge =

MediaDrmBridge::CreateWithoutSessionSupport(kWidevineKeySystem);

EXPECT_TRUE_IF_WIDEVINE_AVAILABLE(media_drm_bridge);

if (!media_drm_bridge)