Add isUnique check to isSameSchemeHostPort.

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

Index: third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp
diff --git a/third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp b/third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp
index e7012fddde34d3dcb282ed483bf29ac35a3bc28d..6d9372ba2fd1ffa4d5faf1933efd9e4748877955 100644
--- a/third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp
+++ b/third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp
@@ -531,6 +531,9 @@ PassRefPtr<SecurityOrigin> SecurityOrigin::create(const String& protocol, const
 
 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;