Commit 2e9359de authored by W. James MacLean's avatar W. James MacLean Committed by Commit Bot

Add max browsing instance count to DwoC.

Add information to the DwoC output to help determine if this is a start-
up or shut-down issue.

Bug: 1148542
Change-Id: I3ecf8db05beb6b94a7489389fdbdcf9e4694607c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2537576
Commit-Queue: James MacLean <wjmaclean@chromium.org>
Reviewed-by: default avatarAlex Moshchuk <alexmos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#827412}
parent 902c49d1
...@@ -590,6 +590,10 @@ class ChildProcessSecurityPolicyImpl::SecurityState { ...@@ -590,6 +590,10 @@ 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);
} }
...@@ -1636,11 +1640,13 @@ bool ChildProcessSecurityPolicyImpl::CanAccessDataForOrigin( ...@@ -1636,11 +1640,13 @@ 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.
failure_reason =
base::StringPrintf("no BrowsingInstanceIds (max count %d)",
security_state->max_browsing_instance_count());
LogCanAccessDataForOriginCrashKeys( LogCanAccessDataForOriginCrashKeys(
expected_process_lock.ToString(), expected_process_lock.ToString(),
GetKilledProcessOriginLock(security_state), url.GetOrigin().spec(), GetKilledProcessOriginLock(security_state), url.GetOrigin().spec(),
"process is locked, but there are no BrowsingInstanceIds " failure_reason);
"registered");
base::debug::DumpWithoutCrashing(); base::debug::DumpWithoutCrashing();
return true; return true;
} }
......
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