Split GetPermissionStatus into GetPermissionStatusForFrame/Worker

content/shell/browser/layout_test/layout_test_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/layout_test/layout_test_permission_manager.h"
 
 #include <list>
 #include <memory>
 #include <utility>
 
@@ skipping 102 matching lines @@
 
   base::AutoLock lock(permissions_lock_);
 
   auto it = permissions_.find(
       PermissionDescription(permission, requesting_origin, embedding_origin));
   if (it == permissions_.end())
     return;
   permissions_.erase(it);
 }
 
-blink::mojom::PermissionStatus LayoutTestPermissionManager::GetPermissionStatus(
+blink::mojom::PermissionStatus
+LayoutTestPermissionManager::GetPermissionStatusForFrame(
     PermissionType permission,
-    const GURL& requesting_origin,
-    const GURL& embedding_origin) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) ||
-         BrowserThread::CurrentlyOn(BrowserThread::IO));
+    content::RenderFrameHost* render_frame_host,
+    const GURL& requesting_origin) {
+  return GetPermissionStatus(permission, requesting_origin,
+                             WebContents::FromRenderFrameHost(render_frame_host)
+                                 ->GetLastCommittedURL()
+                                 .GetOrigin());
+}
 
-  base::AutoLock lock(permissions_lock_);
-
-  auto it = permissions_.find(
-      PermissionDescription(permission, requesting_origin, embedding_origin));
-  if (it == permissions_.end())
-    return blink::mojom::PermissionStatus::DENIED;
-  return it->second;
+blink::mojom::PermissionStatus
+LayoutTestPermissionManager::GetPermissionStatusForWorker(
+    PermissionType permission,
+    const GURL& requesting_origin) {
+  return GetPermissionStatus(permission, requesting_origin, requesting_origin);
 }
 
 int LayoutTestPermissionManager::SubscribePermissionStatusChange(
     PermissionType permission,
     const GURL& requesting_origin,
     const GURL& embedding_origin,
     const base::Callback<void(blink::mojom::PermissionStatus)>& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   auto subscription = base::MakeUnique<Subscription>();
@@ skipping 64 matching lines @@
 
     // Add the callback to |callbacks| which will be run after the loop to
     // prevent re-entrance issues.
     callbacks.push_back(base::Bind(subscription->callback, status));
   }
 
   for (const auto& callback : callbacks)
     callback.Run();
 }
 
+blink::mojom::PermissionStatus LayoutTestPermissionManager::GetPermissionStatus(
+    PermissionType permission,
+    const GURL& requesting_origin,
+    const GURL& embedding_origin) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) ||
+         BrowserThread::CurrentlyOn(BrowserThread::IO));
+
+  base::AutoLock lock(permissions_lock_);
+
+  auto it = permissions_.find(
+      PermissionDescription(permission, requesting_origin, embedding_origin));
+  if (it == permissions_.end())
+    return blink::mojom::PermissionStatus::DENIED;
+  return it->second;
+}
+
 }  // namespace content