media: Move EnableEncryptedMedia check to KeySystemConfigSelector
Currently, the Encrypted Media ("Protected Content") setting is checked
before any other spec'd steps in
NavigatorRequestMediaKeySystemAccess::requestMediaKeySystemAccess().
For consistency with the spec, this should be checked where Key System
support is checked in step 6.1: "If keySystem is not one of the Key
Systems supported by the user agent, reject promise with a
NotSupportedError."
Currently the preference is a WebPreference. To make it easier to check
in media/blink code, change the preference to be a RendererPreference.
BUG=776217
Change-Id: If94d976d07572b8f48c044d1d0c717cdb0ed7f67
Reviewed-on: https://chromium-review.googlesource.com/754066
Commit-Queue: Xiaohan Wang <[email protected]>
Reviewed-by: Daniel Cheng <[email protected]>
Reviewed-by: John Abd-El-Malek <[email protected]>
Reviewed-by: David Dorwin <[email protected]>
Reviewed-by: John Rummell <[email protected]>
Cr-Commit-Position: refs/heads/master@{#516532}diff --git a/chrome/browser/renderer_preferences_util.cc b/chrome/browser/renderer_preferences_util.cc
index 7296a04..7adef910 100644
--- a/chrome/browser/renderer_preferences_util.cc
+++ b/chrome/browser/renderer_preferences_util.cc
@@ -90,6 +90,8 @@
prefs->enable_referrers = pref_service->GetBoolean(prefs::kEnableReferrers);
prefs->enable_do_not_track =
pref_service->GetBoolean(prefs::kEnableDoNotTrack);
+ prefs->enable_encrypted_media =
+ pref_service->GetBoolean(prefs::kEnableEncryptedMedia);
#if BUILDFLAG(ENABLE_WEBRTC)
prefs->webrtc_ip_handling_policy = std::string();
// Handling the backward compatibility of previous boolean verions of policy
