Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(448)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/media/cdm/browser_cdm_manager.cc

Issue 1341883003: Prepare MediaDrmBridge to work with MediaCodecPlayer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bug526755
Patch Set: Cleanup 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
« no previous file with comments | « content/browser/media/cdm/browser_cdm_manager.h ('k') | media/base/android/browser_cdm_factory_android.h » ('j') | media/base/android/media_drm_bridge.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/media/cdm/browser_cdm_manager.cc
diff --git a/content/browser/media/cdm/browser_cdm_manager.cc b/content/browser/media/cdm/browser_cdm_manager.cc
index eefceba28b97d1a73cd31834fb3b34d231a554ae..84412848d522653c5ea094d05c612f4cec71408d 100644
--- a/content/browser/media/cdm/browser_cdm_manager.cc
+++ b/content/browser/media/cdm/browser_cdm_manager.cc
@@ -31,6 +31,7 @@
namespace content {
using media::BrowserCdm;
+using media::BrowserCdmPtr;
using media::MediaKeys;
namespace {
@@ -541,7 +542,7 @@ void BrowserCdmManager::AddCdm(int render_frame_id,
scoped_ptr<SimplePromise> promise(new SimplePromise(
weak_ptr_factory_.GetWeakPtr(), render_frame_id, cdm_id, promise_id));
- scoped_ptr<BrowserCdm> cdm(media::CreateBrowserCdm(
+ BrowserCdmPtr cdm(media::CreateBrowserCdm(
key_system, use_hw_secure_codecs,
BROWSER_CDM_MANAGER_CB(OnSessionMessage),
BROWSER_CDM_MANAGER_CB(OnSessionClosed),
« no previous file with comments | « content/browser/media/cdm/browser_cdm_manager.h ('k') | media/base/android/browser_cdm_factory_android.h » ('j') | media/base/android/media_drm_bridge.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698