media: Remove kRAConsentGranted pref.

chrome/browser/media/protected_media_identifier_permission_context.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/media/protected_media_identifier_permission_context.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 11 matching lines @@
 #include "chromeos/settings/cros_settings_names.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/user_prefs/user_prefs.h"
 #include "ui/views/widget/widget.h"
 #elif defined(OS_ANDROID)
 #include "media/base/media_switches.h"
 #else
 #error This file currently only supports Chrome OS and Android.
 #endif
 
+#if defined(OS_CHROMEOS)
+using chromeos::attestation::PlatformVerificationDialog;
+#endif
+
 ProtectedMediaIdentifierPermissionContext::
     ProtectedMediaIdentifierPermissionContext(Profile* profile)
     : PermissionContextBase(profile,
                             CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER)
 #if defined(OS_CHROMEOS)
       ,
       weak_factory_(this)
 #endif
 {
 }
 
 ProtectedMediaIdentifierPermissionContext::
     ~ProtectedMediaIdentifierPermissionContext() {
 }
 
-#if defined(OS_CHROMEOS)
-using chromeos::attestation::PlatformVerificationDialog;
-
-// static
-void ProtectedMediaIdentifierPermissionContext::RegisterProfilePrefs(
-    user_prefs::PrefRegistrySyncable* prefs) {
-  prefs->RegisterBooleanPref(prefs::kRAConsentGranted,
-                             false,  // Default value.
-                             user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
-}
-#endif
-
 void ProtectedMediaIdentifierPermissionContext::RequestPermission(
     content::WebContents* web_contents,
     const PermissionRequestID& id,
     const GURL& requesting_origin,
     bool user_gesture,
     const BrowserPermissionCallback& callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   GURL embedding_origin = web_contents->GetLastCommittedURL().GetOrigin();
 
@@ skipping 51 matching lines @@
       !IsProtectedMediaIdentifierEnabled()) {
     return CONTENT_SETTING_BLOCK;
   }
 
   ContentSetting content_setting = PermissionContextBase::GetPermissionStatus(
       requesting_origin, embedding_origin);
   DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
          content_setting == CONTENT_SETTING_BLOCK ||
          content_setting == CONTENT_SETTING_ASK);
 
-#if defined(OS_CHROMEOS)
-  // Check kRAConsentGranted here because it's possible that user dismissed
-  // the dialog triggered by RequestPermission() and the content setting is
-  // set to "allow" by server sync. In this case, we should still "ask".
-  if (content_setting == CONTENT_SETTING_ALLOW &&
-      !profile()->GetPrefs()->GetBoolean(prefs::kRAConsentGranted)) {
-    content_setting = CONTENT_SETTING_ASK;
-  }
-#elif defined(OS_ANDROID)
+#if defined(OS_ANDROID)
   // When kDisableInfobarForProtectedMediaIdentifier is enabled, do not "ask"
   // the user and always "allow".
   if (content_setting == CONTENT_SETTING_ASK &&
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableInfobarForProtectedMediaIdentifier)) {
     content_setting = CONTENT_SETTING_ALLOW;
   }
 #endif
 
   return content_setting;
@@ skipping 65 matching lines @@
     DVLOG(1) << "Protected media identifier disabled by the user or by device "
                 "policy.";
     return false;
   }
 #endif
 
   return true;
 }
 
 #if defined(OS_CHROMEOS)
-static void RecordRAConsentGranted(content::WebContents* web_contents) {
-  PrefService* pref_service =
-      user_prefs::UserPrefs::Get(web_contents->GetBrowserContext());
-  if (!pref_service) {
-    LOG(ERROR) << "Failed to get user prefs.";
-    return;
-  }
-  pref_service->SetBoolean(prefs::kRAConsentGranted, true);
-}
-
 void ProtectedMediaIdentifierPermissionContext::
     OnPlatformVerificationConsentResponse(
         content::WebContents* web_contents,
         const PermissionRequestID& id,
         const GURL& requesting_origin,
         const GURL& embedding_origin,
         const BrowserPermissionCallback& callback,
         PlatformVerificationDialog::ConsentResponse response) {
   // The request may have been canceled. Drop the callback in that case.
   PendingRequestMap::iterator request = pending_requests_.find(web_contents);
   if (request == pending_requests_.end())
     return;
 
   DCHECK(request->second.second.Equals(id));
   pending_requests_.erase(request);
 
   ContentSetting content_setting = CONTENT_SETTING_ASK;
   bool persist = false; // Whether the ContentSetting should be saved.
   switch (response) {
     case PlatformVerificationDialog::CONSENT_RESPONSE_NONE:
       content_setting = CONTENT_SETTING_ASK;
       persist = false;
       break;
     case PlatformVerificationDialog::CONSENT_RESPONSE_ALLOW:
       VLOG(1) << "Platform verification accepted by user.";
       content::RecordAction(
           base::UserMetricsAction("PlatformVerificationAccepted"));
-      RecordRAConsentGranted(web_contents);
       content_setting = CONTENT_SETTING_ALLOW;
       persist = true;
       break;
     case PlatformVerificationDialog::CONSENT_RESPONSE_DENY:
       VLOG(1) << "Platform verification denied by user.";
       content::RecordAction(
           base::UserMetricsAction("PlatformVerificationRejected"));
       content_setting = CONTENT_SETTING_BLOCK;
       persist = true;
       break;
   }
 
   NotifyPermissionSet(
       id, requesting_origin, embedding_origin, callback,
       persist, content_setting);
 }
 #endif