Restrict use of hardware-secure codecs based on the RendererPreference.

content/renderer/render_frame_impl.cc

Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 03f9bee485379b6d60b02a7841668d76108e831e..fb81114edcc935b710bd35c2d48f87ec3e9b0d2f 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -3499,6 +3499,10 @@ blink::WebUserMediaClient* RenderFrameImpl::userMediaClient() {
 blink::WebEncryptedMediaClient* RenderFrameImpl::encryptedMediaClient() {
   if (!web_encrypted_media_client_) {
     web_encrypted_media_client_.reset(new media::WebEncryptedMediaClientImpl(
+#if defined(OS_ANDROID)
+        base::Bind(&RenderFrameImpl::AllowSecureSurfaces,
+                   base::Unretained(this)),
+#endif
         GetCdmFactory(), GetMediaPermission()));
   }
   return web_encrypted_media_client_.get();
@@ -4824,6 +4828,14 @@ media::MediaPermission* RenderFrameImpl::GetMediaPermission() {
   return media_permission_dispatcher_;
 }
 
+#if defined(OS_ANDROID)
+bool RenderFrameImpl::AllowSecureSurfaces() {
+  content::RendererPreferences& renderer_preferences =
+      render_view_->renderer_preferences();
+  return renderer_prefences.use_video_overlay_for_embedded_encrypted_video;
+}
+#endif  // defined(OS_ANDROID)
+
 media::CdmFactory* RenderFrameImpl::GetCdmFactory() {
 #if defined(ENABLE_BROWSER_CDMS)
   if (!cdm_manager_)