| Index: content/common/origin_util.cc | 
| diff --git a/content/common/origin_util.cc b/content/common/origin_util.cc | 
| index 4de5ccb62c661c21391d9e36c10e3626786ceb66..3ff16ce693dc8dc32afeacbab6a2581045a56394 100644 | 
| --- a/content/common/origin_util.cc | 
| +++ b/content/common/origin_util.cc | 
| @@ -14,12 +14,12 @@ | 
|  | 
| namespace { | 
|  | 
| -// This function partially reflects the result from SecurityOrigin::isUnique, | 
| +// This function partially reflects the result from SecurityOrigin::isOpaque, | 
| // not its actual implementation. It takes into account how | 
| -// SecurityOrigin::create might return unique origins for URLs whose schemes are | 
| +// SecurityOrigin::create might return opaque origins for URLs whose schemes are | 
| // included in SchemeRegistry::shouldTreatURLSchemeAsNoAccess. | 
| -bool IsOriginUnique(const url::Origin& origin) { | 
| -  return origin.unique() || | 
| +bool IsOriginOpaque(const url::Origin& origin) { | 
| +  return origin.opaque() || | 
| base::ContainsValue(url::GetNoAccessSchemes(), origin.scheme()); | 
| } | 
|  | 
| @@ -60,7 +60,7 @@ bool OriginCanAccessServiceWorkers(const GURL& url) { | 
| } | 
|  | 
| bool IsOriginWhiteListedTrustworthy(const url::Origin& origin) { | 
| -  if (IsOriginUnique(origin)) | 
| +  if (IsOriginOpaque(origin)) | 
| return false; | 
|  | 
| return base::ContainsValue(GetSecureOrigins(), | 
| @@ -73,7 +73,7 @@ bool IsPotentiallyTrustworthyOrigin(const url::Origin& origin) { | 
| // implementation follows Blink's default behavior but in the renderer it can | 
| // be changed per instance by calls to | 
| // SecurityOrigin::setUniqueOriginIsPotentiallyTrustworthy. | 
| -  if (IsOriginUnique(origin)) | 
| +  if (IsOriginOpaque(origin)) | 
| return false; | 
|  | 
| if (base::ContainsValue(url::GetSecureSchemes(), origin.scheme()) || | 
|  |