Chromium Code Reviews| Index: net/base/registry_controlled_domains/registry_controlled_domain.cc |
| diff --git a/net/base/registry_controlled_domains/registry_controlled_domain.cc b/net/base/registry_controlled_domains/registry_controlled_domain.cc |
| index 4d0d781186cc5643e138691bb42aeb2bdc1b5eec..91bcf2a848f2d6bda1742181065d48c8980abfff 100644 |
| --- a/net/base/registry_controlled_domains/registry_controlled_domain.cc |
| +++ b/net/base/registry_controlled_domains/registry_controlled_domain.cc |
| @@ -222,6 +222,13 @@ bool SameDomainOrHost(const url::Origin& origin1, |
| return SameDomainOrHost(origin1.GetURL(), origin2.GetURL(), filter); |
| } |
| +bool SameDomainOrHost(const url::Origin& origin1, |
| + const base::Optional<url::Origin>& origin2, |
| + PrivateRegistryFilter filter) { |
| + return SameDomainOrHost( |
| + origin1, origin2.has_value() ? origin2.value() : url::Origin(), filter); |
|
Mike West
2016/10/14 13:05:59
Rather than passing in `url::Origin()`, could you
clamy
2016/10/19 16:00:43
Done.
|
| +} |
| + |
| size_t GetRegistryLength( |
| const GURL& gurl, |
| UnknownRegistryFilter unknown_filter, |