Merge SecurityOrigin::canAccessCheckSuborigins into canAccess

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

 /*
  * Copyright (C) 2013 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 316 matching lines @@
   EXPECT_FALSE(origin->isSameSchemeHostPortAndSuborigin(other2.get()));
   EXPECT_FALSE(origin->isSameSchemeHostPortAndSuborigin(other3.get()));
   EXPECT_FALSE(origin->isSameSchemeHostPortAndSuborigin(other4.get()));
 }
 
 TEST_F(SecurityOriginTest, CanAccess) {
   RuntimeEnabledFeatures::setSuboriginsEnabled(true);
 
   struct TestCase {
     bool canAccess;
-    bool canAccessCheckSuborigins;
     const char* origin1;
     const char* origin2;
   };
 
   TestCase tests[] = {
-      {true, true, "https://foobar.com", "https://foobar.com"},
-      {false, false, "https://foobar.com", "https://bazbar.com"},
-      {true, false, "https://foobar.com", "https-so://name.foobar.com"},
-      {true, false, "https-so://name.foobar.com", "https://foobar.com"},
-      {true, true, "https-so://name.foobar.com", "https-so://name.foobar.com"},
+      {true, "https://foobar.com", "https://foobar.com"},
+      {false, "https://foobar.com", "https://bazbar.com"},
+      {false, "https://foobar.com", "https-so://name.foobar.com"},
+      {false, "https-so://name.foobar.com", "https://foobar.com"},
+      {true, "https-so://name.foobar.com", "https-so://name.foobar.com"},
   };
 
   for (size_t i = 0; i < WTF_ARRAY_LENGTH(tests); ++i) {
     RefPtr<SecurityOrigin> origin1 =
         SecurityOrigin::createFromString(tests[i].origin1);
     RefPtr<SecurityOrigin> origin2 =
         SecurityOrigin::createFromString(tests[i].origin2);
     EXPECT_EQ(tests[i].canAccess, origin1->canAccess(origin2.get()));
-    EXPECT_EQ(tests[i].canAccessCheckSuborigins,
-              origin1->canAccessCheckSuborigins(origin2.get()));
   }
 }
 
 TEST_F(SecurityOriginTest, CanRequest) {
   RuntimeEnabledFeatures::setSuboriginsEnabled(true);
 
   struct TestCase {
     bool canRequest;
     bool canRequestNoSuborigin;
     const char* origin;
@@ skipping 154 matching lines @@
     SCOPED_TRACE(testing::Message() << "raw host: '" << test.host << "'");
     String host = String::fromUTF8(test.host);
     bool success = false;
     String canonicalHost = SecurityOrigin::canonicalizeHost(host, &success);
     EXPECT_EQ(test.canonicalOutput, canonicalHost);
     EXPECT_EQ(test.expectedSuccess, success);
   }
 }
 
 }  // namespace blink