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

Unified Diff: chromecast/browser/media/cast_browser_cdm_factory.h

Issue 1407933010: media: Make MediaKeys ref-counted. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 5 years, 1 month 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 | « no previous file | chromecast/browser/media/cast_browser_cdm_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromecast/browser/media/cast_browser_cdm_factory.h
diff --git a/chromecast/browser/media/cast_browser_cdm_factory.h b/chromecast/browser/media/cast_browser_cdm_factory.h
index e10858db4f5ebfdf315ae6b1715f7e61afa533f4..c55b8fa3c8c36b0a3e3b3f78daa4bbff16e8acc3 100644
--- a/chromecast/browser/media/cast_browser_cdm_factory.h
+++ b/chromecast/browser/media/cast_browser_cdm_factory.h
@@ -6,8 +6,8 @@
#define CHROMECAST_BROWSER_MEDIA_CAST_BROWSER_CDM_FACTORY_H_
#include "chromecast/media/base/key_systems_common.h"
-#include "media/base/browser_cdm.h"
#include "media/base/browser_cdm_factory.h"
+#include "media/base/media_keys.h"
namespace chromecast {
namespace media {
@@ -20,7 +20,7 @@ class CastBrowserCdmFactory : public ::media::BrowserCdmFactory {
~CastBrowserCdmFactory() override {};
// ::media::BrowserCdmFactory implementation:
- ::media::ScopedBrowserCdmPtr CreateBrowserCdm(
+ scoped_refptr<::media::MediaKeys> CreateBrowserCdm(
const std::string& key_system,
bool use_hw_secure_codecs,
const ::media::SessionMessageCB& session_message_cb,
@@ -31,7 +31,7 @@ class CastBrowserCdmFactory : public ::media::BrowserCdmFactory {
override;
// Provides a platform-specific BrowserCdm instance.
- virtual scoped_ptr<BrowserCdmCast> CreatePlatformBrowserCdm(
+ virtual scoped_refptr<BrowserCdmCast> CreatePlatformBrowserCdm(
const CastKeySystem& key_system);
private:
« no previous file with comments | « no previous file | chromecast/browser/media/cast_browser_cdm_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698