ContentBrowserClient::RequestPermission replies with PermissionStatus instead of bool.

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"
@@ skipping 34 matching lines @@
     const GURL& requesting_origin,
     bool user_gesture,
     const BrowserPermissionCallback& callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   GURL embedding_origin = web_contents->GetLastCommittedURL().GetOrigin();
 
   if (!requesting_origin.is_valid() || !embedding_origin.is_valid() ||
       !IsProtectedMediaIdentifierEnabled()) {
     NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
-                        false /* persist */, false /* granted */);
+                        false /* persist */, CONTENT_SETTING_BLOCK);
     return;
   }
 
 #if defined(OS_CHROMEOS)
   // On ChromeOS, we don't use PermissionContextBase::RequestPermission() which
   // uses the standard permission infobar/bubble UI. See http://crbug.com/454847
   // Instead, we check the content setting and show the existing platform
   // verification UI.
   // TODO(xhwang): Remove when http://crbug.com/454847 is fixed.
   ContentSetting content_setting =
       GetPermissionStatus(requesting_origin, embedding_origin);
 
-  switch (content_setting) {
-    case CONTENT_SETTING_BLOCK:
-      NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
-                          false /* persist */, false /* granted */);
-      return;
-    case CONTENT_SETTING_ALLOW:
-      NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
-                          false /* persist */, true /* granted */);
-      return;
-    default:
-      break;
+  if (content_setting == CONTENT_SETTING_ALLOW ||
+      content_setting == CONTENT_SETTING_BLOCK) {
+    NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
+                        false /* persist */, content_setting);
+    return;
   }
 
   // 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(false);
+    callback.Run(CONTENT_SETTING_DEFAULT);
     return;
   }
 
   views::Widget* widget = PlatformVerificationDialog::ShowDialog(
       web_contents, requesting_origin,
       base::Bind(&ProtectedMediaIdentifierPermissionContext::
                      OnPlatformVerificationResult,
                  weak_factory_.GetWeakPtr(), web_contents, id,
                  requesting_origin, embedding_origin, callback));
   pending_requests_.insert(
@@ skipping 86 matching lines @@
     const BrowserPermissionCallback& callback,
     chromeos::attestation::PlatformVerificationFlow::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);
 
-  if (response == PlatformVerificationFlow::CONSENT_RESPONSE_NONE) {
-    // Deny request and do not save to content settings.
-    NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
-                        false,   // Do not save to content settings.
-                        false);  // Do not allow the permission.
-    return;
+  ContentSetting content_setting;
+  bool persist; // Whether the ContentSetting should be saved.
+  switch (response) {
+    case PlatformVerificationFlow::CONSENT_RESPONSE_NONE:
+      content_setting = CONTENT_SETTING_DEFAULT;
+      persist = false;
+      break;
+    case PlatformVerificationFlow::CONSENT_RESPONSE_ALLOW:
+      content_setting = CONTENT_SETTING_ALLOW;
+      persist = true;
+      break;
+    case PlatformVerificationFlow::CONSENT_RESPONSE_DENY:
+      content_setting = CONTENT_SETTING_BLOCK;
+      persist = true;
+      break;
   }
 
   NotifyPermissionSet(
       id, requesting_origin, embedding_origin, callback,
-      true,  // Save to content settings.
-      response == PlatformVerificationFlow::CONSENT_RESPONSE_ALLOW);
+      persist, content_setting);
 }
 #endif