| Index: content/browser/frame_host/render_frame_host_manager.cc
|
| diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
|
| index 6de0f24d8ae81b9428617f5287e1fd7fc76a9562..f6509e6a9ba37a140ae5c2deacc82095d1b2fb75 100644
|
| --- a/content/browser/frame_host/render_frame_host_manager.cc
|
| +++ b/content/browser/frame_host/render_frame_host_manager.cc
|
| @@ -1609,7 +1609,7 @@ bool RenderFrameHostManager::IsCurrentlySameSite(RenderFrameHostImpl* candidate,
|
| // It is possible that last_successful_url() was a nonstandard scheme (for
|
| // example, "about:blank"). If so, examine the replicated origin to determine
|
| // the site.
|
| - if (!candidate->GetLastCommittedOrigin().unique() &&
|
| + if (!candidate->GetLastCommittedOrigin().opaque() &&
|
| SiteInstance::IsSameWebSite(
|
| browser_context,
|
| GURL(candidate->GetLastCommittedOrigin().Serialize()), dest_url)) {
|
| @@ -2760,16 +2760,16 @@ bool RenderFrameHostManager::CanSubframeSwapProcess(
|
| if (!SiteIsolationPolicy::AreCrossProcessFramesPossible())
|
| return false;
|
|
|
| - // If dest_url is a unique origin like about:blank, then the need for a swap
|
| + // If dest_url is an opaque origin like about:blank, then the need for a swap
|
| // is determined by the source_instance or dest_instance.
|
| GURL resolved_url = dest_url;
|
| - if (url::Origin(resolved_url).unique()) {
|
| + if (url::Origin(resolved_url).opaque()) {
|
| if (source_instance) {
|
| resolved_url = source_instance->GetSiteURL();
|
| } else if (dest_instance) {
|
| resolved_url = dest_instance->GetSiteURL();
|
| } else {
|
| - // If there is no SiteInstance this unique origin can be associated with,
|
| + // If there is no SiteInstance this opaque origin can be associated with,
|
| // then we should avoid a process swap.
|
| return false;
|
| }
|
|
|