Split GetPermissionStatus into GetPermissionStatusForFrame/Worker

android_webview/browser/aw_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 "android_webview/browser/aw_permission_manager.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
@@ skipping 471 matching lines @@
   if (pending_request->IsCompleted())
     pending_requests_.Remove(request_id);
 }
 
 void AwPermissionManager::ResetPermission(PermissionType permission,
                                           const GURL& requesting_origin,
                                           const GURL& embedding_origin) {
   result_cache_->ClearResult(permission, requesting_origin, embedding_origin);
 }
 
-PermissionStatus AwPermissionManager::GetPermissionStatus(
+PermissionStatus AwPermissionManager::GetPermissionStatusForFrame(
     PermissionType permission,
-    const GURL& requesting_origin,
-    const GURL& embedding_origin) {
+    content::RenderFrameHost* render_frame_host,
+    const GURL& requesting_origin) {
   // Method is called outside the Permissions API only for this permission.
   if (permission == PermissionType::PROTECTED_MEDIA_IDENTIFIER) {
+    content::WebContents* web_contents =
+        content::WebContents::FromRenderFrameHost(render_frame_host);
+    GURL embedding_origin = web_contents->GetLastCommittedURL().GetOrigin();
     return result_cache_->GetResult(permission, requesting_origin,
                                     embedding_origin);
   } else if (permission == PermissionType::MIDI) {
     return PermissionStatus::GRANTED;
   }
 
   return PermissionStatus::DENIED;
 }
 
+PermissionStatus AwPermissionManager::GetPermissionStatusForWorker(
+    PermissionType permission,
+    const GURL& requesting_origin) {
+  return PermissionStatus::DENIED;

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

Can you add a comment why this is always denied?

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

Nit: ^^^

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

Done.

+}
+
 int AwPermissionManager::SubscribePermissionStatusChange(
     PermissionType permission,
     const GURL& requesting_origin,
     const GURL& embedding_origin,
     const base::Callback<void(PermissionStatus)>& callback) {
   return kNoPendingOperation;
 }
 
 void AwPermissionManager::UnsubscribePermissionStatusChange(
     int subscription_id) {
@@ skipping 26 matching lines @@
       ->GetLastCommittedURL().GetOrigin();
 }
 
 AwBrowserPermissionRequestDelegate* AwPermissionManager::GetDelegate(
     int render_process_id, int render_frame_id) {
   return AwBrowserPermissionRequestDelegate::FromID(render_process_id,
                                                     render_frame_id);
 }
 
 }  // namespace android_webview