Have Permission{Manager,Service} use Origin.

chrome/browser/chromeos/attestation/platform_verification_flow.cc

Index: chrome/browser/chromeos/attestation/platform_verification_flow.cc
diff --git a/chrome/browser/chromeos/attestation/platform_verification_flow.cc b/chrome/browser/chromeos/attestation/platform_verification_flow.cc
index 794ed3ab3b752afb0adc01945d193650b8815389..4ab179f802c0c90a077a73688cb65098100554cc 100644
--- a/chrome/browser/chromeos/attestation/platform_verification_flow.cc
+++ b/chrome/browser/chromeos/attestation/platform_verification_flow.cc
@@ -38,6 +38,7 @@
 #include "content/public/common/url_constants.h"
 #include "net/cert/pem_tokenizer.h"
 #include "net/cert/x509_certificate.h"
+#include "url/origin.h"
 
 namespace {
 
@@ -112,10 +113,8 @@ class DefaultDelegate : public PlatformVerificationFlow::Delegate {
     // TODO(xhwang): Using delegate_->GetURL() here is not right. The platform
     // verification may be requested by a frame from a different origin. This
     // will be solved when http://crbug.com/454847 is fixed.
-    const GURL& requesting_origin = GetURL(web_contents).GetOrigin();
-
-    GURL embedding_origin = web_contents->GetLastCommittedURL().GetOrigin();
-
+    const url::Origin requesting_origin(GetURL(web_contents));
+    const url::Origin embedding_origin(web_contents->GetLastCommittedURL());
     ContentSetting content_setting = permission_context->GetPermissionStatus(
         requesting_origin, embedding_origin);