
This reverts commit eb0a64dbb3
.
Reason for revert: Causes a substantial increase in browser crashes on Canary.
Original change's description:
> Don't skip isolation check for empty BrowsingInstanceId in tests.
>
> This CL modifies GetMatchingProcessIsolatedOrigin to make sure that,
> if it's called with an IsolationContext that has no BrowsingInstanceId
> (which commonly happens in tests), that it gives the correct isolation
> when OriginKeyedProcessesByDefault is enabled.
>
> This bug doesn't exist without OriginKeyedProcessesByDefault enabled,
> since all that's left is opt-in/opt-out isolation, and neither of those can occur without a BrowsingInstanceId.
>
> Bug: 40259221
> Change-Id: Ib810c80f9710f8f270a7fad36abb2cbf5332d7a2
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5572325
> Reviewed-by: Charlie Reis <creis@chromium.org>
> Commit-Queue: W. James Maclean <wjmaclean@chromium.org>
> Reviewed-by: Alex Moshchuk <alexmos@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1308848}
Bug: 40259221, 338792924
Change-Id: Ie0bba451babfb732b143d8bbdaaf9fe6d2b1fc61
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5592571
Commit-Queue: Wez <wez@chromium.org>
Reviewed-by: Charlie Reis <creis@chromium.org>
Auto-Submit: Wez <wez@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Charlie Reis <creis@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1309339}
46 lines
1.5 KiB
C++
46 lines
1.5 KiB
C++
// Copyright 2019 The Chromium Authors
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "content/browser/isolation_context.h"
|
|
|
|
namespace content {
|
|
|
|
IsolationContext::IsolationContext(BrowserContext* browser_context)
|
|
: browser_or_resource_context_(BrowserOrResourceContext(browser_context)),
|
|
is_guest_(false),
|
|
is_fenced_(false),
|
|
default_isolation_state_(
|
|
OriginAgentClusterIsolationState::CreateForDefaultIsolation(
|
|
browser_context)) {
|
|
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
|
}
|
|
|
|
IsolationContext::IsolationContext(
|
|
BrowsingInstanceId browsing_instance_id,
|
|
BrowserContext* browser_context,
|
|
bool is_guest,
|
|
bool is_fenced,
|
|
OriginAgentClusterIsolationState default_isolation_state)
|
|
: IsolationContext(browsing_instance_id,
|
|
BrowserOrResourceContext(browser_context),
|
|
is_guest,
|
|
is_fenced,
|
|
default_isolation_state) {
|
|
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
|
}
|
|
|
|
IsolationContext::IsolationContext(
|
|
BrowsingInstanceId browsing_instance_id,
|
|
BrowserOrResourceContext browser_or_resource_context,
|
|
bool is_guest,
|
|
bool is_fenced,
|
|
OriginAgentClusterIsolationState default_isolation_state)
|
|
: browsing_instance_id_(browsing_instance_id),
|
|
browser_or_resource_context_(browser_or_resource_context),
|
|
is_guest_(is_guest),
|
|
is_fenced_(is_fenced),
|
|
default_isolation_state_(default_isolation_state) {}
|
|
|
|
} // namespace content
|