diff options
Diffstat (limited to 'chromium/content/browser/site_instance_impl_unittest.cc')
| -rw-r--r-- | chromium/content/browser/site_instance_impl_unittest.cc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/chromium/content/browser/site_instance_impl_unittest.cc b/chromium/content/browser/site_instance_impl_unittest.cc index 2d1b28d9992..c523ca9a06b 100644 --- a/chromium/content/browser/site_instance_impl_unittest.cc +++ b/chromium/content/browser/site_instance_impl_unittest.cc @@ -7,6 +7,7 @@ #include <stddef.h> #include <memory> +#include <string> #include <vector> #include "base/command_line.h" @@ -47,7 +48,7 @@ const char kPrivilegedScheme[] = "privileged"; class SiteInstanceTestBrowserClient : public TestContentBrowserClient { public: - explicit SiteInstanceTestBrowserClient() + SiteInstanceTestBrowserClient() : privileged_process_id_(-1), site_instance_delete_count_(0), browsing_instance_delete_count_(0) { @@ -896,7 +897,7 @@ TEST_F(SiteInstanceTest, IsolatedOrigins) { EXPECT_FALSE(policy->IsIsolatedOrigin(url::Origin(isolated_foo_url))); EXPECT_TRUE(SiteInstance::IsSameWebSite(nullptr, foo_url, isolated_foo_url)); - policy->AddIsolatedOrigin(url::Origin(isolated_foo_url)); + policy->AddIsolatedOrigins({url::Origin(isolated_foo_url)}); EXPECT_TRUE(policy->IsIsolatedOrigin(url::Origin(isolated_foo_url))); EXPECT_FALSE(policy->IsIsolatedOrigin(url::Origin(foo_url))); EXPECT_FALSE(policy->IsIsolatedOrigin(url::Origin(GURL("http://foo.com")))); @@ -907,7 +908,7 @@ TEST_F(SiteInstanceTest, IsolatedOrigins) { EXPECT_FALSE(policy->IsIsolatedOrigin( url::Origin(GURL("http://isolated.foo.com:12345")))); - policy->AddIsolatedOrigin(url::Origin(isolated_bar_url)); + policy->AddIsolatedOrigins({url::Origin(isolated_bar_url)}); EXPECT_TRUE(policy->IsIsolatedOrigin(url::Origin(isolated_bar_url))); // IsSameWebSite should compare origins rather than sites if either URL is an @@ -997,7 +998,7 @@ TEST_F(SiteInstanceTest, SubdomainOnIsolatedSite) { GURL foo_isolated_url("http://foo.isolated.com"); auto* policy = ChildProcessSecurityPolicyImpl::GetInstance(); - policy->AddIsolatedOrigin(url::Origin(isolated_url)); + policy->AddIsolatedOrigins({url::Origin(isolated_url)}); EXPECT_TRUE(policy->IsIsolatedOrigin(url::Origin(isolated_url))); EXPECT_TRUE(policy->IsIsolatedOrigin(url::Origin(foo_isolated_url))); @@ -1031,7 +1032,7 @@ TEST_F(SiteInstanceTest, SubdomainOnIsolatedSite) { // Don't try to match subdomains on IP addresses. GURL isolated_ip("http://127.0.0.1"); - policy->AddIsolatedOrigin(url::Origin(isolated_ip)); + policy->AddIsolatedOrigins({url::Origin(isolated_ip)}); EXPECT_TRUE(policy->IsIsolatedOrigin(url::Origin(isolated_ip))); EXPECT_FALSE( policy->IsIsolatedOrigin(url::Origin(GURL("http://42.127.0.0.1")))); @@ -1047,7 +1048,7 @@ TEST_F(SiteInstanceTest, SubdomainOnIsolatedOrigin) { GURL baz_isolated_foo_url("http://baz.isolated.foo.com"); auto* policy = ChildProcessSecurityPolicyImpl::GetInstance(); - policy->AddIsolatedOrigin(url::Origin(isolated_foo_url)); + policy->AddIsolatedOrigins({url::Origin(isolated_foo_url)}); EXPECT_FALSE(policy->IsIsolatedOrigin(url::Origin(foo_url))); EXPECT_TRUE(policy->IsIsolatedOrigin(url::Origin(isolated_foo_url))); @@ -1099,8 +1100,8 @@ TEST_F(SiteInstanceTest, MultipleIsolatedOriginsWithCommonSite) { GURL qux_baz_bar_foo_url("http://qux.baz.bar.foo.com"); auto* policy = ChildProcessSecurityPolicyImpl::GetInstance(); - policy->AddIsolatedOrigin(url::Origin(foo_url)); - policy->AddIsolatedOrigin(url::Origin(baz_bar_foo_url)); + policy->AddIsolatedOrigins({url::Origin(foo_url)}); + policy->AddIsolatedOrigins({url::Origin(baz_bar_foo_url)}); EXPECT_TRUE(policy->IsIsolatedOrigin(url::Origin(foo_url))); EXPECT_TRUE(policy->IsIsolatedOrigin(url::Origin(bar_foo_url))); |