content/browser/frame_host/navigator_impl_unittest.cc - Issue 1797363002: "Top Document Isolation" mode

Unified Diff: content/browser/frame_host/navigator_impl_unittest.cc

Issue 1797363002: "Top Document Isolation" mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix up tests. Necessary rebase to obtain browsertest util behavior change. Created 4 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« content/browser/browsing_instance.cc ('K') | « content/browser/browsing_instance.cc ('k') | content/browser/frame_host/render_frame_host_impl.h » ('j') | content/browser/frame_host/render_frame_host_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/navigator_impl_unittest.cc

diff --git a/content/browser/frame_host/navigator_impl_unittest.cc b/content/browser/frame_host/navigator_impl_unittest.cc

index 6c93e1f0e0815f5a99061185071cd5daf9db90d2..901474fbd6b9c1f30993e6a34eb2010629a79ab4 100644

--- a/content/browser/frame_host/navigator_impl_unittest.cc

+++ b/content/browser/frame_host/navigator_impl_unittest.cc

@@ -43,9 +43,8 @@ namespace content {

class NavigatorTestWithBrowserSideNavigation

: public RenderViewHostImplTestHarness {

public:

- // Re-defines the private RenderFrameHostManager::SiteInstanceDescriptor here

- // to allow access to it from tests.

- typedef RenderFrameHostManager::SiteInstanceDescriptor SiteInstanceDescriptor;

+ using SiteInstanceDescriptor = RenderFrameHostManager::SiteInstanceDescriptor;

+ using SiteInstanceRelation = RenderFrameHostManager::SiteInstanceRelation;

void SetUp() override {

#if !defined(OS_ANDROID)

@@ -1048,7 +1047,8 @@ TEST_F(NavigatorTestWithBrowserSideNavigation,

// current one.

GURL kUrlSameSiteAs1("http://www.a.com/foo");

{

- SiteInstanceDescriptor descriptor(browser_context(), kUrlSameSiteAs1, true);

+ SiteInstanceDescriptor descriptor(browser_context(), kUrlSameSiteAs1,

+ SiteInstanceRelation::RELATED);

SiteInstance* converted_instance =

ConvertToSiteInstance(rfhm, descriptor, nullptr);

EXPECT_EQ(current_instance, converted_instance);

@@ -1059,7 +1059,8 @@ TEST_F(NavigatorTestWithBrowserSideNavigation,

GURL kUrlSameSiteAs2("http://www.b.com/foo");

scoped_refptr<SiteInstance> related_instance;

{

- SiteInstanceDescriptor descriptor(browser_context(), kUrlSameSiteAs2, true);

+ SiteInstanceDescriptor descriptor(browser_context(), kUrlSameSiteAs2,

+ SiteInstanceRelation::RELATED);

related_instance = ConvertToSiteInstance(rfhm, descriptor, nullptr);

// Should return a new instance, related to the current, set to the new site

// URL.

@@ -1075,7 +1076,7 @@ TEST_F(NavigatorTestWithBrowserSideNavigation,

// current one, several times, with and without candidate sites.

{

SiteInstanceDescriptor descriptor(browser_context(), kUrlSameSiteAs1,

- false);

+ SiteInstanceRelation::UNRELATED);

scoped_refptr<SiteInstance> converted_instance_1 =

ConvertToSiteInstance(rfhm, descriptor, nullptr);

// Should return a new instance, unrelated to the current one, set to the

@@ -1113,7 +1114,7 @@ TEST_F(NavigatorTestWithBrowserSideNavigation,

// related_instance and using it as a candidate.

{

SiteInstanceDescriptor descriptor(browser_context(), kUrlSameSiteAs2,

- false);

+ SiteInstanceRelation::UNRELATED);

scoped_refptr<SiteInstance> converted_instance_1 =

ConvertToSiteInstance(rfhm, descriptor, related_instance.get());

// Should return a new instance, unrelated to the current, set to the