Add isUnique check to isSameSchemeHostPort.

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

Index: third_party/WebKit/Source/platform/weborigin/SecurityOriginTest.cpp
diff --git a/third_party/WebKit/Source/platform/weborigin/SecurityOriginTest.cpp b/third_party/WebKit/Source/platform/weborigin/SecurityOriginTest.cpp
index 483f19a2e671c4cf76a0268ecdb0364b3e418c6a..b2f04e14e087b8d53ed41ccd138c5e2b8b75e2e5 100644
--- a/third_party/WebKit/Source/platform/weborigin/SecurityOriginTest.cpp
+++ b/third_party/WebKit/Source/platform/weborigin/SecurityOriginTest.cpp
@@ -81,7 +81,7 @@ TEST_F(SecurityOriginTest, LocalAccess)
     // Block |file1|'s access to local origins. It should now be same-origin
     // with itself, but shouldn't have access to |file2|.
     file1->blockLocalAccessFromLocalOrigin();
-    EXPECT_FALSE(file1->isSameSchemeHostPort(file1.get()));
+    EXPECT_TRUE(file1->isSameSchemeHostPort(file1.get()));
     EXPECT_FALSE(file1->isSameSchemeHostPort(file2.get()));
     EXPECT_FALSE(file2->isSameSchemeHostPort(file1.get()));
 
@@ -435,4 +435,15 @@ TEST_F(SecurityOriginTest, UniquenessPropagatesToBlobUrls)
     }
 }
 
+TEST_F(SecurityOriginTest, UniqueOriginIsSameSchemeHostPort)
+{
+    RefPtr<SecurityOrigin> uniqueOrigin = SecurityOrigin::createUnique();
+    RefPtr<SecurityOrigin> tupleOrigin = SecurityOrigin::createFromString("http://example.com");
+
+    EXPECT_TRUE(uniqueOrigin->isSameSchemeHostPort(uniqueOrigin.get()));

[Mike West, 2016/06/03 05:22:04]

Why is this true? I'd expect it to be false (because unique origins aren't
same-origin with any other origin, including themselves).

[Marijn Kruisselbrink, 2016/06/03 05:25:11]

According to the HTML specification of origins an unique origin (there called an
opaque origin) is in fact same-origin with itself
(https://html.spec.whatwg.org/multipage/browsers.html#same-origin). And we
certainly treat them that way various places in the code-base (a sandboxed
iframe with an opaque origin for example can create a blob URL with the same
origin as itself, which it can then read/use to create a same-origin worker,
etc).

+    EXPECT_FALSE(SecurityOrigin::createUnique()->isSameSchemeHostPort(uniqueOrigin.get()));
+    EXPECT_FALSE(tupleOrigin->isSameSchemeHostPort(uniqueOrigin.get()));
+    EXPECT_FALSE(uniqueOrigin->isSameSchemeHostPort(tupleOrigin.get()));
+}
+
 } // namespace blink