media: Check kDisableInfobarForProtectedMediaIdentifier in ProtectedMediaIdentifierPermissionContex…

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/prefs/pref_service.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "components/content_settings/core/common/permission_request_id.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 
 #if defined(OS_CHROMEOS)
 #include <utility>
 
 #include "chrome/browser/chromeos/attestation/platform_verification_dialog.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #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"
-
-using chromeos::attestation::PlatformVerificationDialog;
+#elif defined(OS_ANDROID)
+#include "base/command_line.h"
+#include "media/base/media_switches.h"
+#else
+#error This file should only be used on ChromeOS or Android.

[ddorwin, 2015/03/17 00:43:11]

"This file currently only supports Chrome OS and Android."

Other platforms probably should use it, but we don't have support implemented
yet.

[xhwang, 2015/03/17 01:33:28]

Done.

 #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(
@@ skipping 13 matching lines @@
       GetPermissionStatus(requesting_origin, embedding_origin);
 
   if (content_setting == CONTENT_SETTING_ALLOW ||
       content_setting == CONTENT_SETTING_BLOCK) {
     NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
                         false /* persist */, content_setting);
     return;
   }
 
   DCHECK_EQ(CONTENT_SETTING_ASK, content_setting);
 

[ddorwin, 2015/03/17 00:43:11]

Note: Not recording the Allow is important, especially since there is a flag to
enable this on Android, which also supports user permissions.

I worry about this code changing in such a way that we end up writing ALLOW when
the switch is present. One option would be to
DCHECK(!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableInfobarForProtectedMediaIdentifier)).
Another would be to DCHECK wherever the settings get written, but that is more
generic code.

[xhwang, 2015/03/17 01:33:28]

Added DCHECK.

 #if defined(OS_CHROMEOS)
   // Since the dialog is modal, we only support one prompt per |web_contents|.
   // Reject the new one if there is already one pending. See
   // http://crbug.com/447005
   if (pending_requests_.count(web_contents)) {
     callback.Run(CONTENT_SETTING_ASK);
     return;
   }
 
   // On ChromeOS, we don't use PermissionContextBase::RequestPermission() which
@@ skipping 25 matching lines @@
     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)
-  if (content_setting == CONTENT_SETTING_ALLOW) {
-    // 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 (profile()->GetPrefs()->GetBoolean(prefs::kRAConsentGranted))
-      return CONTENT_SETTING_ALLOW;
-    else
-      return CONTENT_SETTING_ASK;
+  // 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)
+  // 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;
 }
 
 void ProtectedMediaIdentifierPermissionContext::CancelPermissionRequest(
     content::WebContents* web_contents,
     const PermissionRequestID& id) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
@@ skipping 75 matching lines @@
   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,
-        chromeos::attestation::PlatformVerificationDialog::ConsentResponse
-            response) {
+        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.
@@ skipping 17 matching lines @@
       content_setting = CONTENT_SETTING_BLOCK;
       persist = true;
       break;
   }
 
   NotifyPermissionSet(
       id, requesting_origin, embedding_origin, callback,
       persist, content_setting);
 }
 #endif