| Index: third_party/WebKit/Source/platform/weborigin/OriginAccessEntryTest.cpp
|
| diff --git a/third_party/WebKit/Source/platform/weborigin/OriginAccessEntryTest.cpp b/third_party/WebKit/Source/platform/weborigin/OriginAccessEntryTest.cpp
|
| index 4136c98b0cfc67936ce9a5eb1551a461018a84c2..40d400caf0a15e70db7144aef933bfd9da82b252 100644
|
| --- a/third_party/WebKit/Source/platform/weborigin/OriginAccessEntryTest.cpp
|
| +++ b/third_party/WebKit/Source/platform/weborigin/OriginAccessEntryTest.cpp
|
| @@ -30,52 +30,14 @@
|
|
|
| #include "platform/weborigin/OriginAccessEntry.h"
|
|
|
| -#include "platform/testing/TestingPlatformSupport.h"
|
| #include "platform/weborigin/KURL.h"
|
| #include "platform/weborigin/SecurityOrigin.h"
|
| -#include "public/platform/Platform.h"
|
| -#include "public/platform/WebPublicSuffixList.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| namespace blink {
|
|
|
| -class OriginAccessEntryTestSuffixList : public blink::WebPublicSuffixList {
|
| -public:
|
| - size_t getPublicSuffixLength(const blink::WebString&) override
|
| - {
|
| - return m_length;
|
| - }
|
| -
|
| - void setPublicSuffix(const blink::WebString& suffix)
|
| - {
|
| - m_length = suffix.length();
|
| - }
|
| -
|
| -private:
|
| - size_t m_length;
|
| -};
|
| -
|
| -class OriginAccessEntryTestPlatform : public TestingPlatformSupport {
|
| -public:
|
| - blink::WebPublicSuffixList* publicSuffixList() override
|
| - {
|
| - return &m_suffixList;
|
| - }
|
| -
|
| - void setPublicSuffix(const blink::WebString& suffix)
|
| - {
|
| - m_suffixList.setPublicSuffix(suffix);
|
| - }
|
| -
|
| -private:
|
| - OriginAccessEntryTestSuffixList m_suffixList;
|
| -};
|
| -
|
| TEST(OriginAccessEntryTest, PublicSuffixListTest)
|
| {
|
| - OriginAccessEntryTestPlatform platform;
|
| - platform.setPublicSuffix("com");
|
| -
|
| RefPtr<SecurityOrigin> origin = SecurityOrigin::createFromString("http://www.google.com");
|
| OriginAccessEntry entry1("http", "google.com", OriginAccessEntry::AllowSubdomains);
|
| OriginAccessEntry entry2("http", "hamster.com", OriginAccessEntry::AllowSubdomains);
|
| @@ -113,9 +75,6 @@ TEST(OriginAccessEntryTest, AllowSubdomainsTest)
|
| { "https", "", "http://beispiel.de/", OriginAccessEntry::DoesNotMatchOrigin, OriginAccessEntry::MatchesOrigin },
|
| };
|
|
|
| - OriginAccessEntryTestPlatform platform;
|
| - platform.setPublicSuffix("com");
|
| -
|
| for (const auto& test : inputs) {
|
| SCOPED_TRACE(testing::Message() << "Host: " << test.host << ", Origin: " << test.origin);
|
| RefPtr<SecurityOrigin> originToTest = SecurityOrigin::createFromString(test.origin);
|
| @@ -151,9 +110,6 @@ TEST(OriginAccessEntryTest, AllowRegisterableDomainsTest)
|
| { "https", "", "http://beispiel.de/", OriginAccessEntry::DoesNotMatchOrigin },
|
| };
|
|
|
| - OriginAccessEntryTestPlatform platform;
|
| - platform.setPublicSuffix("com");
|
| -
|
| for (const auto& test : inputs) {
|
| RefPtr<SecurityOrigin> originToTest = SecurityOrigin::createFromString(test.origin);
|
| OriginAccessEntry entry1(test.protocol, test.host, OriginAccessEntry::AllowRegisterableDomains);
|
| @@ -189,9 +145,6 @@ TEST(OriginAccessEntryTest, AllowRegisterableDomainsTestWithDottedSuffix)
|
| { "https", "", "http://beispiel.de/", OriginAccessEntry::DoesNotMatchOrigin },
|
| };
|
|
|
| - OriginAccessEntryTestPlatform platform;
|
| - platform.setPublicSuffix("appspot.com");
|
| -
|
| for (const auto& test : inputs) {
|
| RefPtr<SecurityOrigin> originToTest = SecurityOrigin::createFromString(test.origin);
|
| OriginAccessEntry entry1(test.protocol, test.host, OriginAccessEntry::AllowRegisterableDomains);
|
| @@ -224,9 +177,6 @@ TEST(OriginAccessEntryTest, DisallowSubdomainsTest)
|
| { "https", "", "http://beispiel.de/", OriginAccessEntry::DoesNotMatchOrigin },
|
| };
|
|
|
| - OriginAccessEntryTestPlatform platform;
|
| - platform.setPublicSuffix("com");
|
| -
|
| for (const auto& test : inputs) {
|
| SCOPED_TRACE(testing::Message() << "Host: " << test.host << ", Origin: " << test.origin);
|
| RefPtr<SecurityOrigin> originToTest = SecurityOrigin::createFromString(test.origin);
|
| @@ -253,9 +203,6 @@ TEST(OriginAccessEntryTest, IPAddressTest)
|
| { "http", "", false },
|
| };
|
|
|
| - OriginAccessEntryTestPlatform platform;
|
| - platform.setPublicSuffix("com");
|
| -
|
| for (const auto& test : inputs) {
|
| SCOPED_TRACE(testing::Message() << "Host: " << test.host);
|
| OriginAccessEntry entry(test.protocol, test.host, OriginAccessEntry::DisallowSubdomains);
|
| @@ -277,9 +224,6 @@ TEST(OriginAccessEntryTest, IPAddressMatchingTest)
|
| { "http", "1.123", "http://192.0.0.123/", OriginAccessEntry::DoesNotMatchOrigin },
|
| };
|
|
|
| - OriginAccessEntryTestPlatform platform;
|
| - platform.setPublicSuffix("com");
|
| -
|
| for (const auto& test : inputs) {
|
| SCOPED_TRACE(testing::Message() << "Host: " << test.host << ", Origin: " << test.origin);
|
| RefPtr<SecurityOrigin> originToTest = SecurityOrigin::createFromString(test.origin);
|
|
|