Split GetPermissionStatus into GetPermissionStatusForFrame/Worker

content/shell/browser/shell_permission_manager.cc

 // Copyright 2015 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 "content/shell/browser/shell_permission_manager.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "content/public/browser/permission_type.h"
 #include "content/public/common/content_switches.h"
@@ skipping 48 matching lines @@
 
 void ShellPermissionManager::CancelPermissionRequest(int request_id) {
 }
 
 void ShellPermissionManager::ResetPermission(
     PermissionType permission,
     const GURL& requesting_origin,
     const GURL& embedding_origin) {
 }
 
-blink::mojom::PermissionStatus ShellPermissionManager::GetPermissionStatus(
+blink::mojom::PermissionStatus
+ShellPermissionManager::GetPermissionStatusForFrame(

[benwells, 2017/05/31 01:48:10]

Nit: This would be clearer if there was a private / internal function that both
of these use.

[raymes, 2017/06/01 02:54:40]

Done.

     PermissionType permission,
-    const GURL& requesting_origin,
-    const GURL& embedding_origin) {
+    content::RenderFrameHost* render_frame_host,
+    const GURL& requesting_origin) {
   // Background sync browser tests require permission to be granted by default.
   // TODO(nsatragno): add a command line flag so that it's only granted for
   // tests.
   if (permission == PermissionType::BACKGROUND_SYNC)
     return blink::mojom::PermissionStatus::GRANTED;
 
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   if ((permission == PermissionType::AUDIO_CAPTURE ||
        permission == PermissionType::VIDEO_CAPTURE) &&
       command_line->HasSwitch(switches::kUseFakeDeviceForMediaStream) &&
       command_line->HasSwitch(switches::kUseFakeUIForMediaStream)) {
     return blink::mojom::PermissionStatus::GRANTED;
   }
   return blink::mojom::PermissionStatus::DENIED;
 }
 
+blink::mojom::PermissionStatus
+ShellPermissionManager::GetPermissionStatusForWorker(
+    PermissionType permission,
+    const GURL& requesting_origin) {
+  return GetPermissionStatusForFrame(permission, /*render_frame_host=*/nullptr,

[benwells, 2017/05/30 06:49:13]

nit: is this a typical way of commenting nullptrs? I've never seen it before.

[benwells, 2017/05/31 01:48:10]

(thanks for explaining offline)

+                                     requesting_origin);
+}
+
 int ShellPermissionManager::SubscribePermissionStatusChange(
     PermissionType permission,
     const GURL& requesting_origin,
     const GURL& embedding_origin,
     const base::Callback<void(blink::mojom::PermissionStatus)>& callback) {
   return kNoPendingOperation;
 }
 
 void ShellPermissionManager::UnsubscribePermissionStatusChange(
     int subscription_id) {
 }
 
 }  // namespace content