Have Permission{Manager,Service} use Origin.

content/shell/browser/shell_permission_manager.cc

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 783342448b1ec4ecabf138c48cb2bb0acc543359..324892308dd19aa1ca7ca73b683d9d64ede03590 100644
--- a/content/shell/browser/shell_permission_manager.cc
+++ b/content/shell/browser/shell_permission_manager.cc
@@ -9,6 +9,7 @@
 #include "content/public/browser/permission_type.h"
 #include "content/public/common/content_switches.h"
 #include "media/base/media_switches.h"
+#include "url/origin.h"
 
 namespace content {
 
@@ -22,7 +23,7 @@ ShellPermissionManager::~ShellPermissionManager() {
 int ShellPermissionManager::RequestPermission(
     PermissionType permission,
     RenderFrameHost* render_frame_host,
-    const GURL& requesting_origin,
+    const url::Origin& requesting_origin,
     const base::Callback<void(mojom::PermissionStatus)>& callback) {
   callback.Run(permission == PermissionType::GEOLOCATION
                    ? mojom::PermissionStatus::GRANTED
@@ -33,7 +34,7 @@ int ShellPermissionManager::RequestPermission(
 int ShellPermissionManager::RequestPermissions(
     const std::vector<PermissionType>& permissions,
     content::RenderFrameHost* render_frame_host,
-    const GURL& requesting_origin,
+    const url::Origin& requesting_origin,
     const base::Callback<void(const std::vector<mojom::PermissionStatus>&)>&
         callback) {
   std::vector<mojom::PermissionStatus> result(permissions.size());
@@ -51,14 +52,13 @@ void ShellPermissionManager::CancelPermissionRequest(int request_id) {
 
 void ShellPermissionManager::ResetPermission(
     PermissionType permission,
-    const GURL& requesting_origin,
-    const GURL& embedding_origin) {
-}
+    const url::Origin& requesting_origin,
+    const url::Origin& embedding_origin) {}
 
 mojom::PermissionStatus ShellPermissionManager::GetPermissionStatus(
     PermissionType permission,
-    const GURL& requesting_origin,
-    const GURL& embedding_origin) {
+    const url::Origin& requesting_origin,
+    const url::Origin& embedding_origin) {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   if ((permission == PermissionType::AUDIO_CAPTURE ||
        permission == PermissionType::VIDEO_CAPTURE) &&
@@ -71,14 +71,13 @@ mojom::PermissionStatus ShellPermissionManager::GetPermissionStatus(
 
 void ShellPermissionManager::RegisterPermissionUsage(
     PermissionType permission,
-    const GURL& requesting_origin,
-    const GURL& embedding_origin) {
-}
+    const url::Origin& requesting_origin,
+    const url::Origin& embedding_origin) {}
 
 int ShellPermissionManager::SubscribePermissionStatusChange(
     PermissionType permission,
-    const GURL& requesting_origin,
-    const GURL& embedding_origin,
+    const url::Origin& requesting_origin,
+    const url::Origin& embedding_origin,
     const base::Callback<void(mojom::PermissionStatus)>& callback) {
   return kNoPendingOperation;
 }