Have Permission{Manager,Service} use Origin.

chrome/browser/media/media_permission.cc

Index: chrome/browser/media/media_permission.cc
diff --git a/chrome/browser/media/media_permission.cc b/chrome/browser/media/media_permission.cc
index 4ba868139af7abe64962af4d0c8c6327c4c2a6ee..eb34c6e8956e675a52ddcc5f60d7d5c7cd07c761 100644
--- a/chrome/browser/media/media_permission.cc
+++ b/chrome/browser/media/media_permission.cc
@@ -94,13 +94,14 @@ ContentSetting MediaPermission::GetPermissionStatusWithDeviceRequired(
 
 ContentSetting MediaPermission::GetStoredContentSetting(
     MediaStreamDevicePermissionContext* media_device_permission_context) const {
+  const url::Origin requesting(requesting_origin_);
+  const url::Origin embedding(embedding_origin_);
   if (is_insecure_pepper_request_) {
     return media_device_permission_context
-        ->GetPermissionStatusAllowingInsecureForPepper(requesting_origin_,
-                                                       embedding_origin_);
+        ->GetPermissionStatusAllowingInsecureForPepper(requesting, embedding);
   } else {
-    return media_device_permission_context->GetPermissionStatus(
-        requesting_origin_, embedding_origin_);
+    return media_device_permission_context->GetPermissionStatus(requesting,
+                                                                embedding);
   }
 }