summaryrefslogtreecommitdiffstats
path: root/chrome/browser/prefs
diff options
context:
space:
mode:
authorxhwang <xhwang@chromium.org>2015-04-03 11:29:56 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-03 18:31:34 +0000
commit0ef984eae4e562fc9e0b7ae23f9a4de778e3881f (patch)
tree8f436f20dd00effa0d69f3f560bad84020741f8b /chrome/browser/prefs
parentdcd96071b3753563a779a62956048f12e20a3cac (diff)
downloadchromium_src-0ef984eae4e562fc9e0b7ae23f9a4de778e3881f.zip
chromium_src-0ef984eae4e562fc9e0b7ae23f9a4de778e3881f.tar.gz
chromium_src-0ef984eae4e562fc9e0b7ae23f9a4de778e3881f.tar.bz2
media: Remove kRAConsentGranted pref.
Now protected media identifier content setting is not synced, we don't need kRAConsentGranted pref any more. Whether we should prompt user solely depends on the content setting status. TBR=sky@chromium.org BUG=468569 TEST=Manually tested. Review URL: https://codereview.chromium.org/1024563005 Cr-Commit-Position: refs/heads/master@{#323779}
Diffstat (limited to 'chrome/browser/prefs')
-rw-r--r--chrome/browser/prefs/browser_prefs.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index abef534..ba0926a 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -498,7 +498,6 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction::
RegisterProfilePrefs(registry);
FlagsUI::RegisterProfilePrefs(registry);
- ProtectedMediaIdentifierPermissionContext::RegisterProfilePrefs(registry);
#endif
#if defined(OS_WIN)