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 ad515e04ec88f74915717fe28144c4a654ecfeec..d6d976814f16427b7d3c4f0df7bd9d4fdc5afb47 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -3586,6 +3586,8 @@ blink::WebUserMediaClient* RenderFrameImpl::userMediaClient() {
 blink::WebEncryptedMediaClient* RenderFrameImpl::encryptedMediaClient() {
   if (!web_encrypted_media_client_) {
     web_encrypted_media_client_.reset(new media::WebEncryptedMediaClientImpl(
+        base::Bind(&RenderFrameImpl::AreSecureSurfacesSupported,
+                   base::Unretained(this)),
         GetCdmFactory(), GetMediaPermission()));
   }
   return web_encrypted_media_client_.get();
@@ -4918,6 +4920,16 @@ media::MediaPermission* RenderFrameImpl::GetMediaPermission() {
   return media_permission_dispatcher_;
 }
 
+bool RenderFrameImpl::AreSecureSurfacesSupported() {
+#if defined(OS_ANDROID)
+  content::RendererPreferences& renderer_preferences =
+      render_view_->renderer_preferences();
+  return renderer_prefences.use_video_overlay_for_embedded_encrypted_video;
+#endif  // defined(OS_ANDROID)
+
+  return false;

[ddorwin, 2015/05/08 03:18:31]

Must be in #else or you'll have unreachable code.

[sandersd (OOO until July 31), 2015/05/08 18:04:45]

Done.

+}
+
 media::CdmFactory* RenderFrameImpl::GetCdmFactory() {
 #if defined(ENABLE_BROWSER_CDMS)
   if (!cdm_manager_)