Index: content/shell/browser/shell_permission_manager.cc |
diff --git a/content/shell/browser/shell_permission_manager.cc b/content/shell/browser/shell_permission_manager.cc |
index aed1bd334b777ffb7dc2f81fa13780178ff31bfe..d9163e82e207a9ddbb6a025b78a9b03ea2cbc4e1 100644 |
--- a/content/shell/browser/shell_permission_manager.cc |
+++ b/content/shell/browser/shell_permission_manager.cc |
@@ -19,6 +19,23 @@ bool IsWhitelistedPermissionType(PermissionType permission) { |
permission == PermissionType::MIDI; |
} |
+blink::mojom::PermissionStatus GetPermissionStatus(PermissionType permission) { |
+ // 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; |
+} |
+ |
} // namespace |
ShellPermissionManager::ShellPermissionManager() |
@@ -66,24 +83,19 @@ void ShellPermissionManager::ResetPermission( |
const GURL& embedding_origin) { |
} |
-blink::mojom::PermissionStatus ShellPermissionManager::GetPermissionStatus( |
+blink::mojom::PermissionStatus |
+ShellPermissionManager::GetPermissionStatusForFrame( |
PermissionType permission, |
- const GURL& requesting_origin, |
- const GURL& embedding_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; |
+ content::RenderFrameHost* render_frame_host, |
+ const GURL& requesting_origin) { |
+ return GetPermissionStatus(permission); |
+} |
- 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 GetPermissionStatus(permission); |
} |
int ShellPermissionManager::SubscribePermissionStatusChange( |