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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 865683004: media: Make |web_encrypted_media_client_| a scoped_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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/renderer/render_frame_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index fb5f2b51b94291be69fbca171ff0649e3d82116e..8ad82fe8ccfa7df1eafd64b2c295287b9af2bad5 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -636,7 +636,6 @@ RenderFrameImpl::RenderFrameImpl(RenderViewImpl* render_view, int routing_id)
handling_select_range_(false),
notification_permission_dispatcher_(NULL),
web_user_media_client_(NULL),
- web_encrypted_media_client_(NULL),
midi_dispatcher_(NULL),
#if defined(OS_ANDROID)
media_player_manager_(NULL),
@@ -3355,10 +3354,10 @@ blink::WebEncryptedMediaClient* RenderFrameImpl::encryptedMediaClient() {
#else
scoped_ptr<media::CdmFactory> cdm_factory(new RenderCdmFactory());
#endif
- web_encrypted_media_client_ =
- new media::WebEncryptedMediaClientImpl(cdm_factory.Pass());
+ web_encrypted_media_client_.reset(
+ new media::WebEncryptedMediaClientImpl(cdm_factory.Pass()));
}
- return web_encrypted_media_client_;
+ return web_encrypted_media_client_.get();
}
blink::WebMIDIClient* RenderFrameImpl::webMIDIClient() {
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698