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 currently only supports Chrome OS and Android.
 #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 36 matching lines @@
   // TODO(xhwang): Remove when http://crbug.com/454847 is fixed.
   views::Widget* widget = PlatformVerificationDialog::ShowDialog(
       web_contents, requesting_origin,
       base::Bind(&ProtectedMediaIdentifierPermissionContext::
                      OnPlatformVerificationConsentResponse,
                  weak_factory_.GetWeakPtr(), web_contents, id,
                  requesting_origin, embedding_origin, callback));
   pending_requests_.insert(
       std::make_pair(web_contents, std::make_pair(widget, id)));
 #else
+  DCHECK(!base::CommandLine::ForCurrentProcess()->HasSwitch(

[ddorwin, 2015/03/17 02:43:09]

Note: This only works because the file only supports Android and Chrome OS.

[xhwang, 2015/03/17 21:43:42]

Acknowledged.

+      switches::kDisableInfobarForProtectedMediaIdentifier));
   PermissionContextBase::RequestPermission(web_contents, id, requesting_origin,
                                            user_gesture, callback);
 #endif
 }
 
 ContentSetting ProtectedMediaIdentifierPermissionContext::GetPermissionStatus(
       const GURL& requesting_origin,
       const GURL& embedding_origin) const {
   DVLOG(1) << __FUNCTION__ << ": (" << requesting_origin.spec() << ", "
            << embedding_origin.spec() << ")";
 
   if (!requesting_origin.is_valid() || !embedding_origin.is_valid() ||
       !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)
-  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