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

Unified Diff: content/public/test/mock_render_process_host.cc

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 | « content/public/test/mock_render_process_host.h ('k') | content/renderer/media/crypto/ppapi_decryptor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/test/mock_render_process_host.cc
diff --git a/content/public/test/mock_render_process_host.cc b/content/public/test/mock_render_process_host.cc
index e0f9d019f97b9eab6a1c4573012daf738ce07025..aef164f69659570616a0b7936c7f4885339e92de 100644
--- a/content/public/test/mock_render_process_host.cc
+++ b/content/public/test/mock_render_process_host.cc
@@ -27,6 +27,10 @@
#include "content/public/browser/render_widget_host_iterator.h"
#include "content/public/browser/storage_partition.h"
+#if defined(ENABLE_BROWSER_CDMS)
+#include "media/base/media_keys.h"
+#endif
+
namespace content {
MockRenderProcessHost::MockRenderProcessHost(BrowserContext* browser_context)
@@ -282,8 +286,9 @@ void MockRenderProcessHost::SendUpdateValueState(
}
#if defined(ENABLE_BROWSER_CDMS)
-media::BrowserCdm* MockRenderProcessHost::GetBrowserCdm(int render_frame_id,
- int cdm_id) const {
+scoped_refptr<media::MediaKeys> MockRenderProcessHost::GetCdm(
+ int render_frame_id,
+ int cdm_id) const {
return nullptr;
}
#endif
« no previous file with comments | « content/public/test/mock_render_process_host.h ('k') | content/renderer/media/crypto/ppapi_decryptor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698