Add isUnique check to isSameSchemeHostPort.

third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp

 /*
  * Copyright (C) 2007 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 513 matching lines @@
 {
     if (port < 0 || port > MaxAllowedPort)
         return createUnique();
     String decodedHost = decodeURLEscapeSequences(host);
     String portPart = port ? ":" + String::number(port) : String();
     return create(KURL(KURL(), protocol + "://" + host + portPart + "/"));
 }
 
 bool SecurityOrigin::isSameSchemeHostPort(const SecurityOrigin* other) const
 {
+    if (this != other && (isUnique() || other->isUnique()))

[jww, 2016/06/02 20:49:56]

IMO, if would simpler to first have a check:
  if (this == other)
    return true;
followed by:
  if (isUnique() || other->isUnique())
    return false;

In fact, I think without that, there may be another bug below in the isLocal()
check.

[Marijn Kruisselbrink, 2016/06/02 21:18:53]

Done. Assuming that that was indeed a bug in the isLocal check, since there was
in fact a test explicitly testing that case.

+        return false;
+
     if (m_host != other->m_host)
         return false;
 
     if (m_protocol != other->m_protocol)
         return false;
 
     if (m_port != other->m_port)
         return false;
 
     if (isLocal() && !passesFileCheck(other))
@@ skipping 31 matching lines @@
     m_blockLocalAccessFromLocalOrigin = privilegeData->m_blockLocalAccessFromLocalOrigin;
 }
 
 void SecurityOrigin::setUniqueOriginIsPotentiallyTrustworthy(bool isUniqueOriginPotentiallyTrustworthy)
 {
     ASSERT(!isUniqueOriginPotentiallyTrustworthy || isUnique());
     m_isUniqueOriginPotentiallyTrustworthy = isUniqueOriginPotentiallyTrustworthy;
 }
 
 } // namespace blink