Have Permission{Manager,Service} use Origin.

chrome/browser/media/media_stream_device_permission_context.cc

Index: chrome/browser/media/media_stream_device_permission_context.cc
diff --git a/chrome/browser/media/media_stream_device_permission_context.cc b/chrome/browser/media/media_stream_device_permission_context.cc
index a6febf0091c06be9584b7ee0740e02615af57c51..fa4d759e78cddb797671c3fb6a1195c5aa842278 100644
--- a/chrome/browser/media/media_stream_device_permission_context.cc
+++ b/chrome/browser/media/media_stream_device_permission_context.cc
@@ -26,29 +26,29 @@ MediaStreamDevicePermissionContext::~MediaStreamDevicePermissionContext() {}
 void MediaStreamDevicePermissionContext::RequestPermission(
     content::WebContents* web_contents,
     const PermissionRequestID& id,
-    const GURL& requesting_frame,
+    const url::Origin& requesting_frame,
     const BrowserPermissionCallback& callback) {
   NOTREACHED() << "RequestPermission is not implemented";
   callback.Run(CONTENT_SETTING_BLOCK);
 }
 
 ContentSetting MediaStreamDevicePermissionContext::GetPermissionStatus(
-    const GURL& requesting_origin,
-    const GURL& embedding_origin) const {
+    const url::Origin& requesting_origin,
+    const url::Origin& embedding_origin) const {
   return GetPermissionStatusInternal(requesting_origin, embedding_origin,
                                      false);
 }
 
 ContentSetting MediaStreamDevicePermissionContext::
     GetPermissionStatusAllowingInsecureForPepper(
-        const GURL& requesting_origin,
-        const GURL& embedding_origin) const {
+        const url::Origin& requesting_origin,
+        const url::Origin& embedding_origin) const {
   return GetPermissionStatusInternal(requesting_origin, embedding_origin, true);
 }
 
 void MediaStreamDevicePermissionContext::ResetPermission(
-    const GURL& requesting_origin,
-    const GURL& embedding_origin) {
+    const url::Origin& requesting_origin,
+    const url::Origin& embedding_origin) {
   NOTREACHED() << "ResetPermission is not implemented";
 }
 
@@ -59,8 +59,8 @@ void MediaStreamDevicePermissionContext::CancelPermissionRequest(
 }
 
 ContentSetting MediaStreamDevicePermissionContext::GetPermissionStatusInternal(
-    const GURL& requesting_origin,
-    const GURL& embedding_origin,
+    const url::Origin& requesting_origin,
+    const url::Origin& embedding_origin,
     bool is_pepper_request) const {
   // TODO(raymes): Merge this policy check into content settings
   // crbug.com/244389.
@@ -75,8 +75,9 @@ ContentSetting MediaStreamDevicePermissionContext::GetPermissionStatusInternal(
     urls_policy_name = prefs::kVideoCaptureAllowedUrls;
   }
 
-  MediaStreamDevicePolicy policy = GetDevicePolicy(
-      profile(), requesting_origin, policy_name, urls_policy_name);
+  const GURL requesting_url(requesting_origin.Serialize());
+  MediaStreamDevicePolicy policy =
+      GetDevicePolicy(profile(), requesting_url, policy_name, urls_policy_name);
 
   switch (policy) {
     case ALWAYS_DENY:
@@ -101,11 +102,11 @@ ContentSetting MediaStreamDevicePermissionContext::GetPermissionStatusInternal(
   // the user's content setting. The problem is that pepper requests allow
   // insecure origins to be persisted. We should remove this after
   // crbug.com/526324 is fixed.
-  if (!ShouldPersistContentSetting(setting, requesting_origin,
+  if (!ShouldPersistContentSetting(setting, requesting_url,
                                    is_pepper_request) &&
-      !requesting_origin.SchemeIs(extensions::kExtensionScheme) &&
-      !requesting_origin.SchemeIs(content::kChromeUIScheme) &&
-      !requesting_origin.SchemeIs(content::kChromeDevToolsScheme)) {
+      !requesting_url.SchemeIs(extensions::kExtensionScheme) &&
+      !requesting_url.SchemeIs(content::kChromeUIScheme) &&
+      !requesting_url.SchemeIs(content::kChromeDevToolsScheme)) {
     return CONTENT_SETTING_ASK;
   }