| Index: content/browser/frame_host/render_frame_host_impl.cc
|
| diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
|
| index 5e28794978dd025a4a351bd026740ac4dce01e22..20d8919cd7837a2bd7f327dc5f4afb3a5048fcef 100644
|
| --- a/content/browser/frame_host/render_frame_host_impl.cc
|
| +++ b/content/browser/frame_host/render_frame_host_impl.cc
|
| @@ -2188,7 +2188,7 @@ void RenderFrameHostImpl::OnUpdateToUniqueOrigin(
|
| "frame_tree_node", frame_tree_node_->frame_tree_node_id());
|
|
|
| url::Origin origin;
|
| - DCHECK(origin.unique());
|
| + DCHECK(origin.opaque());
|
| frame_tree_node()->SetCurrentOrigin(origin,
|
| is_potentially_trustworthy_unique_origin);
|
| }
|
| @@ -3033,16 +3033,16 @@ bool RenderFrameHostImpl::CanCommitOrigin(
|
| return true;
|
| }
|
|
|
| - // It is safe to commit into a unique origin, regardless of the URL, as it is
|
| + // It is safe to commit into a opaque origin, regardless of the URL, as it is
|
| // restricted from accessing other origins.
|
| - if (origin.unique())
|
| + if (origin.opaque())
|
| return true;
|
|
|
| // Standard URLs must match the reported origin.
|
| if (url.IsStandard() && !origin.IsSamePhysicalOriginWith(url::Origin(url)))
|
| return false;
|
|
|
| - // A non-unique origin must be a valid URL, which allows us to safely do a
|
| + // A non-opaque origin must be a valid URL, which allows us to safely do a
|
| // conversion to GURL.
|
| GURL origin_url = origin.GetPhysicalOrigin().GetURL();
|
|
|
|
|