Rename Origin.unique() to opaque().

url/origin_unittest.cc

Index: url/origin_unittest.cc
diff --git a/url/origin_unittest.cc b/url/origin_unittest.cc
index b1795916846683c7fe0e63db553be198026c2602..9784655c890af40d9513f4ea019e8f129dc5d4ef 100644
--- a/url/origin_unittest.cc
+++ b/url/origin_unittest.cc
@@ -35,13 +35,13 @@ void ExpectParsedUrlsEqual(const GURL& a, const GURL& b) {
   EXPECT_EQ(a_parsed.ref.len, b_parsed.ref.len);
 }
 
-TEST(OriginTest, UniqueOriginComparison) {
-  url::Origin unique_origin;
-  EXPECT_EQ("", unique_origin.scheme());
-  EXPECT_EQ("", unique_origin.host());
-  EXPECT_EQ(0, unique_origin.port());
-  EXPECT_TRUE(unique_origin.unique());
-  EXPECT_FALSE(unique_origin.IsSameOriginWith(unique_origin));
+TEST(OriginTest, OpaqueOriginComparison) {
+  url::Origin opaque_origin;
+  EXPECT_EQ("", opaque_origin.scheme());
+  EXPECT_EQ("", opaque_origin.host());
+  EXPECT_EQ(0, opaque_origin.port());
+  EXPECT_TRUE(opaque_origin.opaque());
+  EXPECT_FALSE(opaque_origin.IsSameOriginWith(opaque_origin));
 
   const char* const urls[] = {"data:text/html,Hello!",
                               "javascript:alert(1)",
@@ -56,10 +56,10 @@ TEST(OriginTest, UniqueOriginComparison) {
     EXPECT_EQ("", origin.scheme());
     EXPECT_EQ("", origin.host());
     EXPECT_EQ(0, origin.port());
-    EXPECT_TRUE(origin.unique());
+    EXPECT_TRUE(origin.opaque());
     EXPECT_FALSE(origin.IsSameOriginWith(origin));
-    EXPECT_FALSE(unique_origin.IsSameOriginWith(origin));
-    EXPECT_FALSE(origin.IsSameOriginWith(unique_origin));
+    EXPECT_FALSE(opaque_origin.IsSameOriginWith(origin));
+    EXPECT_FALSE(origin.IsSameOriginWith(opaque_origin));
 
     ExpectParsedUrlsEqual(GURL(origin.Serialize()), origin.GetURL());
   }
@@ -160,7 +160,7 @@ TEST(OriginTest, ConstructFromGURL) {
     EXPECT_EQ(test_case.expected_scheme, origin.scheme());
     EXPECT_EQ(test_case.expected_host, origin.host());
     EXPECT_EQ(test_case.expected_port, origin.port());
-    EXPECT_FALSE(origin.unique());
+    EXPECT_FALSE(origin.opaque());
     EXPECT_TRUE(origin.IsSameOriginWith(origin));
     EXPECT_FALSE(different_origin.IsSameOriginWith(origin));
     EXPECT_FALSE(origin.IsSameOriginWith(different_origin));
@@ -244,7 +244,7 @@ TEST(OriginTest, SuboriginSerialization) {
     std::string serialized = origin.Serialize();
     std::string serialized_physical_origin =
         origin.GetPhysicalOrigin().Serialize();
-    EXPECT_FALSE(origin.unique());
+    EXPECT_FALSE(origin.opaque());
     EXPECT_EQ(test_case.expected_suborigin, origin.suborigin());
     ExpectParsedUrlsEqual(GURL(serialized), origin.GetURL());
 
@@ -270,7 +270,7 @@ TEST(OriginTest, SuboriginSerialization) {
     std::string serialized = origin.Serialize();
     std::string serialized_physical_origin =
         origin.GetPhysicalOrigin().Serialize();
-    EXPECT_TRUE(origin.unique());
+    EXPECT_TRUE(origin.opaque());
     EXPECT_EQ("", origin.suborigin());
     ExpectParsedUrlsEqual(GURL(serialized), origin.GetURL());
 
@@ -367,7 +367,7 @@ TEST(OriginTest, UnsafelyCreate) {
     EXPECT_EQ(test.scheme, origin.scheme());
     EXPECT_EQ(test.host, origin.host());
     EXPECT_EQ(test.port, origin.port());
-    EXPECT_FALSE(origin.unique());
+    EXPECT_FALSE(origin.opaque());
     EXPECT_TRUE(origin.IsSameOriginWith(origin));
 
     ExpectParsedUrlsEqual(GURL(origin.Serialize()), origin.GetURL());
@@ -404,7 +404,7 @@ TEST(OriginTest, UnsafelyCreateUniqueOnInvalidInput) {
     EXPECT_EQ("", origin.scheme());
     EXPECT_EQ("", origin.host());
     EXPECT_EQ(0, origin.port());
-    EXPECT_TRUE(origin.unique());
+    EXPECT_TRUE(origin.opaque());
     EXPECT_FALSE(origin.IsSameOriginWith(origin));
 
     ExpectParsedUrlsEqual(GURL(origin.Serialize()), origin.GetURL());
@@ -434,7 +434,7 @@ TEST(OriginTest, UnsafelyCreateUniqueViaEmbeddedNulls) {
     EXPECT_EQ("", origin.scheme());
     EXPECT_EQ("", origin.host());
     EXPECT_EQ(0, origin.port());
-    EXPECT_TRUE(origin.unique());
+    EXPECT_TRUE(origin.opaque());
     EXPECT_FALSE(origin.IsSameOriginWith(origin));
 
     ExpectParsedUrlsEqual(GURL(origin.Serialize()), origin.GetURL());