Commit fc996c05 authored by W. James MacLean's avatar W. James MacLean Committed by Chromium LUCI CQ

Remove DwoC in CanAccessDataForOrigin.

Disabling on M-89 dues to recent spike.

Bug: 1148542
Change-Id: I83b62f75d8e8b034d58f44fe64ab5bae055abeb2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2576430Reviewed-by: default avatarCharlie Reis <creis@chromium.org>
Commit-Queue: Charlie Reis <creis@chromium.org>
Auto-Submit: James MacLean <wjmaclean@chromium.org>
Cr-Commit-Position: refs/heads/master@{#834459}
parent 71be9879
...@@ -590,10 +590,6 @@ class ChildProcessSecurityPolicyImpl::SecurityState { ...@@ -590,10 +590,6 @@ class ChildProcessSecurityPolicyImpl::SecurityState {
return browsing_instance_ids_; return browsing_instance_ids_;
} }
unsigned max_browsing_instance_count() const {
return max_browsing_instance_count_;
}
void ClearBrowsingInstanceId(const BrowsingInstanceId& id) { void ClearBrowsingInstanceId(const BrowsingInstanceId& id) {
browsing_instance_ids_.erase(id); browsing_instance_ids_.erase(id);
} }
...@@ -1640,21 +1636,6 @@ bool ChildProcessSecurityPolicyImpl::CanAccessDataForOrigin( ...@@ -1640,21 +1636,6 @@ bool ChildProcessSecurityPolicyImpl::CanAccessDataForOrigin(
// BrowsingInstances are registered in the process. Allow this for now, // BrowsingInstances are registered in the process. Allow this for now,
// to maintain legacy behavior, until we rule out all the ways it can // to maintain legacy behavior, until we rule out all the ways it can
// happen. // happen.
// Since |security_state| is non-null (see above), and if it's not in
// the list |security_state_|, then it must have been moved to
// |pending_remove_state_| which indicates the associated process is
// being shut down.
bool shutting_down =
security_state_.find(child_id) == security_state_.end();
failure_reason = base::StringPrintf(
"no BrowsingInstanceIds (max count %d) shutdown:%s",
security_state->max_browsing_instance_count(),
shutting_down ? "y" : "n");
LogCanAccessDataForOriginCrashKeys(
expected_process_lock.ToString(),
GetKilledProcessOriginLock(security_state), url.GetOrigin().spec(),
failure_reason);
base::debug::DumpWithoutCrashing();
return true; return true;
} }
for (auto browsing_instance_id : for (auto browsing_instance_id :
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment