Permissions: Allow PermissionManager to return more PermissionStatusSources.

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/metrics/user_metrics.h"
 #include "base/strings/string_split.h"
 #include "build/build_config.h"
@@ skipping 77 matching lines @@
   if (!widget) {
     callback.Run(CONTENT_SETTING_ASK);
     return;
   }
 
   pending_requests_.insert(
       std::make_pair(web_contents, std::make_pair(widget, id)));
 }
 #endif  // defined(OS_CHROMEOS)
 
-ContentSetting
+PermissionResult
 ProtectedMediaIdentifierPermissionContext::GetPermissionStatusInternal(
     content::RenderFrameHost* render_frame_host,
     const GURL& requesting_origin,
     const GURL& embedding_origin) const {
   DVLOG(1) << __func__ << ": (" << requesting_origin.spec() << ", "
            << embedding_origin.spec() << ")";
 
   if (!requesting_origin.is_valid() || !embedding_origin.is_valid() ||
       !IsProtectedMediaIdentifierEnabled()) {
-    return CONTENT_SETTING_BLOCK;
+    return PermissionResult(CONTENT_SETTING_BLOCK,
+                            PermissionStatusSource::UNSPECIFIED);
   }
 
-  ContentSetting content_setting =
-      PermissionContextBase::GetPermissionStatusInternal(
-          render_frame_host, requesting_origin, embedding_origin);
-  DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
-         content_setting == CONTENT_SETTING_BLOCK ||
-         content_setting == CONTENT_SETTING_ASK);
+  PermissionResult result = PermissionContextBase::GetPermissionStatusInternal(
+      render_frame_host, requesting_origin, embedding_origin);
+  DCHECK(result.content_setting == CONTENT_SETTING_ALLOW ||
+         result.content_setting == CONTENT_SETTING_BLOCK ||
+         result.content_setting == CONTENT_SETTING_ASK);
 
   // For automated testing of protected content - having a prompt that
   // requires user intervention is problematic. If the domain has been
   // whitelisted as safe - suppress the request and allow.
-  if (content_setting == CONTENT_SETTING_ASK &&
+  if (result.content_setting == CONTENT_SETTING_ASK &&
       IsOriginWhitelisted(requesting_origin)) {
-    content_setting = CONTENT_SETTING_ALLOW;
+    result.content_setting = CONTENT_SETTING_ALLOW;
+    result.source = PermissionStatusSource::ENTERPRISE_POLICY;
   }
 
-  return content_setting;
+  return result;
 }
 
 bool ProtectedMediaIdentifierPermissionContext::IsOriginWhitelisted(
     const GURL& origin) {
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
 
   if (command_line.GetSwitchValueASCII(switches::kUserDataDir).empty()) {
     return false;
   }
@@ skipping 149 matching lines @@
       content_setting = CONTENT_SETTING_BLOCK;
       persist = true;
       break;
   }
 
   NotifyPermissionSet(
       id, requesting_origin, embedding_origin, callback,
       persist, content_setting);
 }
 #endif