use origin instead of session_id in detecting duplicate EME permission request

The same origin can create a lot of sessions, using session id will generate a lot of duplicate permission requests from a single origin.
This change fixes the behavior by using the origin url.
It also removed the group_id in PermissionRequestId as it is no longer used.

BUG=373641

Review URL: https://codereview.chromium.org/289023003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273457 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 9 insertions, 9 deletions

diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc
index 4efdd6c..c6c020c 100644
--- a/android_webview/browser/aw_browser_context.cc
+++ b/android_webview/browser/aw_browser_context.cc
@@ -237,16 +237,16 @@ void AwBrowserContext::CancelMidiSysExPermissionRequest(
 void AwBrowserContext::RequestProtectedMediaIdentifierPermission(
     int render_process_id,
     int render_view_id,
-    int bridge_id,
-    int group_id,
-    const GURL& requesting_frame,
+    const GURL& origin,
     const ProtectedMediaIdentifierPermissionCallback& callback) {
   NOTIMPLEMENTED();
   callback.Run(false);
 }
 
 void AwBrowserContext::CancelProtectedMediaIdentifierPermissionRequests(
-    int group_id) {
+    int render_process_id,
+    int render_view_id,
+    const GURL& origin) {
   NOTIMPLEMENTED();
 }
 
diff --git a/android_webview/browser/aw_browser_context.h b/android_webview/browser/aw_browser_context.h
index de1c545..8b0c068 100644
--- a/android_webview/browser/aw_browser_context.h
+++ b/android_webview/browser/aw_browser_context.h
@@ -114,12 +114,12 @@ class AwBrowserContext : public content::BrowserContext,
   virtual void RequestProtectedMediaIdentifierPermission(
       int render_process_id,
       int render_view_id,
-      int bridge_id,
-      int group_id,
-      const GURL& requesting_frame,
+      const GURL& origin,
       const ProtectedMediaIdentifierPermissionCallback& callback) OVERRIDE;
-  virtual void CancelProtectedMediaIdentifierPermissionRequests(int group_id)
-      OVERRIDE;
+  virtual void CancelProtectedMediaIdentifierPermissionRequests(
+      int render_process_id,
+      int render_view_id,
+      const GURL& origin) OVERRIDE;
   virtual content::ResourceContext* GetResourceContext() OVERRIDE;
   virtual content::DownloadManagerDelegate*
       GetDownloadManagerDelegate() OVERRIDE;