Have Permission{Manager,Service} use Origin.

content/browser/permissions/permission_service_context.cc

 // Copyright 2014 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 "content/browser/permissions/permission_service_context.h"
 
 #include <utility>
 
 #include "content/browser/permissions/permission_service_impl.h"
 #include "content/public/browser/navigation_details.h"
@@ skipping 64 matching lines @@
 }
 
 BrowserContext* PermissionServiceContext::GetBrowserContext() const {
   if (!web_contents()) {
     DCHECK(render_process_host_);
     return render_process_host_->GetBrowserContext();
   }
   return web_contents()->GetBrowserContext();
 }
 
-GURL PermissionServiceContext::GetEmbeddingOrigin() const {
-  return web_contents() ? web_contents()->GetLastCommittedURL().GetOrigin()
-                        : GURL();
+url::Origin PermissionServiceContext::GetEmbeddingOrigin() const {
+  return web_contents() ? url::Origin(web_contents()->GetLastCommittedURL())
+                        : url::Origin();
 }
 
 RenderFrameHost* PermissionServiceContext::render_frame_host() const {
   return render_frame_host_;
 }
 
 } // namespace content