Have Permission{Manager,Service} use Origin.

chrome/browser/chromeos/attestation/platform_verification_flow.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/attestation/platform_verification_flow.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 20 matching lines @@
 #include "components/user_manager/user.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "net/cert/pem_tokenizer.h"
 #include "net/cert/x509_certificate.h"
+#include "url/origin.h"
 
 namespace {
 
 using chromeos::attestation::PlatformVerificationFlow;
 
 const int kTimeoutInSeconds = 8;
 const char kAttestationResultHistogram[] =
     "ChromeOS.PlatformVerification.Result";
 const char kAttestationAvailableHistogram[] =
     "ChromeOS.PlatformVerification.Available";
@@ skipping 54 matching lines @@
   }
 
   bool IsPermittedByUser(content::WebContents* web_contents) override {
     ProtectedMediaIdentifierPermissionContext* permission_context =
         ProtectedMediaIdentifierPermissionContextFactory::GetForProfile(
             Profile::FromBrowserContext(web_contents->GetBrowserContext()));
 
     // 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);
 
     return content_setting == CONTENT_SETTING_ALLOW;
   }
 
   bool IsInSupportedMode(content::WebContents* web_contents) override {
     Profile* profile =
         Profile::FromBrowserContext(web_contents->GetBrowserContext());
     if (profile->IsOffTheRecord() || profile->IsGuestSession())
@@ skipping 293 matching lines @@
   if (!operation_success) {
     LOG(WARNING) << "PlatformVerificationFlow: Failed to renew platform "
                     "certificate.";
     return;
   }
   VLOG(1) << "Certificate successfully renewed.";
 }
 
 }  // namespace attestation
 }  // namespace chromeos