Rename Origin.unique() to opaque().

content/common/origin_util.cc

 // Copyright 2015 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/public/common/origin_util.h"
 
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/stl_util.h"
 #include "content/common/url_schemes.h"
 #include "net/base/url_util.h"
 #include "url/gurl.h"
 #include "url/url_util.h"
 
 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());
 }
 
 }  // namespace
 
 namespace content {
 
 bool IsOriginSecure(const GURL& url) {
   if (url.SchemeIsCryptographic() || url.SchemeIsFile())
     return true;
@@ skipping 21 matching lines @@
     return true;
 
   if (base::ContainsValue(GetServiceWorkerSchemes(), url.scheme())) {
     return true;
   }
 
   return false;
 }
 
 bool IsOriginWhiteListedTrustworthy(const url::Origin& origin) {
-  if (IsOriginUnique(origin))
+  if (IsOriginOpaque(origin))
     return false;
 
   return base::ContainsValue(GetSecureOrigins(),
                              origin.GetURL().HostNoBrackets());
 }
 
 bool IsPotentiallyTrustworthyOrigin(const url::Origin& origin) {
   // Note: Considering this mirrors SecurityOrigin::isPotentiallyTrustworthy, it
   // assumes m_isUniqueOriginPotentiallyTrustworthy is set to false. This
   // 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()) ||
       base::ContainsValue(url::GetLocalSchemes(), origin.scheme()) ||
       net::IsLocalhost(origin.GetURL().HostNoBrackets())) {
     return true;
   }
 
   if (IsOriginWhiteListedTrustworthy(origin))
     return true;
 
   return false;
 }
 
 }  // namespace content