Have Permission{Manager,Service} use Origin.

chrome/browser/media/media_stream_device_permission_context.h

Index: chrome/browser/media/media_stream_device_permission_context.h
diff --git a/chrome/browser/media/media_stream_device_permission_context.h b/chrome/browser/media/media_stream_device_permission_context.h
index c50b8d552869eb04199bdc61fd8ae25c3702fa54..8a6cacd876d6eb5df9cf6adc29afc08cbc216559 100644
--- a/chrome/browser/media/media_stream_device_permission_context.h
+++ b/chrome/browser/media/media_stream_device_permission_context.h
@@ -25,32 +25,31 @@ class MediaStreamDevicePermissionContext : public PermissionContextBase {
   // PermissionContextBase:
   void RequestPermission(content::WebContents* web_contents,
                          const PermissionRequestID& id,
-                         const GURL& requesting_frame,
+                         const url::Origin& requesting_frame,
                          const BrowserPermissionCallback& callback) override;
 
-  // TODO(xhwang): GURL.GetOrigin() shouldn't be used as the origin. Need to
-  // refactor to use url::Origin. crbug.com/527149 is filed for this.
   ContentSetting GetPermissionStatus(
-      const GURL& requesting_origin,
-      const GURL& embedding_origin) const override;
+      const url::Origin& requesting_origin,
+      const url::Origin& embedding_origin) const override;
 
   // For Pepper request, insecure origins are allowed to be persisted, hence we
   // can't just call GetPermissionStatus when the requesting origin is insecure.
   // TODO(raymes): Remove this after crbug.com/526324 is fixed.
   ContentSetting GetPermissionStatusAllowingInsecureForPepper(
-      const GURL& requesting_origin,
-      const GURL& embedding_origin) const;
+      const url::Origin& requesting_origin,
+      const url::Origin& embedding_origin) const;
 
-  void ResetPermission(const GURL& requesting_origin,
-                       const GURL& embedding_origin) override;
+  void ResetPermission(const url::Origin& requesting_origin,
+                       const url::Origin& embedding_origin) override;
 
   void CancelPermissionRequest(content::WebContents* web_contents,
                                const PermissionRequestID& id) override;
 
  private:
-  ContentSetting GetPermissionStatusInternal(const GURL& requesting_origin,
-                                             const GURL& embedding_origin,
-                                             bool is_pepper_request) const;
+  ContentSetting GetPermissionStatusInternal(
+      const url::Origin& requesting_origin,
+      const url::Origin& embedding_origin,
+      bool is_pepper_request) const;
 
   // PermissionContextBase:
   bool IsRestrictedToSecureOrigins() const override;