Merge WebExposedIsolationInfo into UrlInfo.
We pass the WebExposedIsolationInfo all around the process model code,
but we already have a structure that is meant to package all the
information needed take these decisions: UrlInfo.
This patch bundles WebExposedIsolationInfo into UrlInfo, hopefully
simplifying and clearing up the code base.
The way we achieve this:
- Add WebExposedIsolationInfo into UrlInfo in site_instance_impl.h
- Move the computation of WebExposedIsolationInfo from
RenderFrameHostManager::GetWebExposedIsolationInfo to
NavigationRequest::ComputeWebExposedIsolationInfo, as a part of
NavigationRequest::GetUrlInfo, effectively embedding isolation status
into UrlInfo.
- Remove WebExposedIsolationInfo parameters in functions where we also
pass UrlInfo.
Change-Id: I4f808bf168e71da8d492a09be76a9c164fb4b867
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3101045
Commit-Queue: Arthur Hemery <[email protected]>
Reviewed-by: W. James MacLean <[email protected]>
Reviewed-by: Alex Moshchuk <[email protected]>
Cr-Commit-Position: refs/heads/main@{#916398}
diff --git a/content/browser/renderer_host/navigator_unittest.cc b/content/browser/renderer_host/navigator_unittest.cc
index 799dff8a..6d40c500 100644
--- a/content/browser/renderer_host/navigator_unittest.cc
+++ b/content/browser/renderer_host/navigator_unittest.cc
@@ -1249,8 +1249,7 @@
{
SiteInstanceDescriptor descriptor(
UrlInfo::CreateForTesting(kUrlSameSiteAs1),
- SiteInstanceRelation::RELATED,
- WebExposedIsolationInfo::CreateNonIsolated());
+ SiteInstanceRelation::RELATED);
scoped_refptr<SiteInstance> converted_instance =
ConvertToSiteInstance(rfhm, descriptor, nullptr);
EXPECT_EQ(current_instance, converted_instance);
@@ -1263,8 +1262,7 @@
{
SiteInstanceDescriptor descriptor(
UrlInfo::CreateForTesting(kUrlSameSiteAs2),
- SiteInstanceRelation::RELATED,
- WebExposedIsolationInfo::CreateNonIsolated());
+ SiteInstanceRelation::RELATED);
related_instance = ConvertToSiteInstance(rfhm, descriptor, nullptr);
// If kUrlSameSiteAs2 requires a dedicated process on this platform, this
// should return a new instance, related to the current and set to the new
@@ -1289,8 +1287,7 @@
{
SiteInstanceDescriptor descriptor(
UrlInfo::CreateForTesting(kUrlSameSiteAs1),
- SiteInstanceRelation::UNRELATED,
- WebExposedIsolationInfo::CreateNonIsolated());
+ SiteInstanceRelation::UNRELATED);
scoped_refptr<SiteInstanceImpl> converted_instance_1 =
ConvertToSiteInstance(rfhm, descriptor, nullptr);
// Should return a new instance, unrelated to the current one, set to the
@@ -1329,8 +1326,7 @@
{
SiteInstanceDescriptor descriptor(
UrlInfo::CreateForTesting(kUrlSameSiteAs2),
- SiteInstanceRelation::UNRELATED,
- WebExposedIsolationInfo::CreateNonIsolated());
+ SiteInstanceRelation::UNRELATED);
scoped_refptr<SiteInstanceImpl> converted_instance_1 =
ConvertToSiteInstance(rfhm, descriptor, related_instance.get());
// Should return a new instance, unrelated to the current, set to the
