Commit 10d873fc authored by David Van Cleve's avatar David Van Cleve Committed by Commit Bot

RFHI: Remove crash keys from a now-finished crash investigation

This change cleans up some temporary crash keys used while investigating
crbug.com/1111735.

R=lukasza

Bug: 1111735
Change-Id: I441744d269f8afc508930b51623b992194d1327a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2355293Reviewed-by: default avatarAlex Moshchuk <alexmos@chromium.org>
Reviewed-by: default avatarŁukasz Anforowicz <lukasza@chromium.org>
Commit-Queue: Alex Moshchuk <alexmos@chromium.org>
Auto-Submit: David Van Cleve <davidvc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#798189}
parent 0048e5a6
......@@ -759,14 +759,6 @@ const char* LifecycleStateToString(RenderFrameHostImpl::LifecycleState state) {
}
}
// Returns the crash key string used for logging BeginNavigation calls'
// initiators.
base::debug::CrashKeyString* GetBeginNavigationInitiatorCrashKeyString() {
static auto* initiator_key_string = base::debug::AllocateCrashKeyString(
"begin_navigation_initiator", base::debug::CrashKeySize::Size256);
return initiator_key_string;
}
} // namespace
bool ShouldCreateNewHostForCrashedFrame() {
......@@ -5249,14 +5241,6 @@ void RenderFrameHostImpl::BeginNavigation(
"frame_tree_node", frame_tree_node_->frame_tree_node_id(), "url",
common_params->url.possibly_invalid_spec());
// TODO(crbug.com/1111735): Temporary debugging aids; remove after
// investigating the crash described in this bug.
ScopedActiveURL scoped_active_url(common_params->url,
frame_tree()->root()->current_origin());
url::debug::ScopedOriginCrashKey begin_navigation_initiator_key(
GetBeginNavigationInitiatorCrashKeyString(),
base::OptionalOrNullptr(common_params->initiator_origin));
DCHECK(navigation_client.is_valid());
mojom::CommonNavigationParamsPtr validated_params = common_params.Clone();
......@@ -5276,24 +5260,6 @@ void RenderFrameHostImpl::BeginNavigation(
RenderFrameHostImpl* parent = GetParent();
if (!parent->IsFeatureEnabled(
blink::mojom::FeaturePolicyFeature::kTrustTokenRedemption)) {
// Temporary debugging aid for crbug.com/1111735, where it seems the
// renderer containing the iframe prompting the navigation sometimes does
// have a feature policy but |parent| does not have the feature policy:
static auto* parent_and_initiator_are_same_crash_key_string =
base::debug::AllocateCrashKeyString(
"parent_and_initiator_are_same",
base::debug::CrashKeySize::Size32);
// (This frame should have the same process ID as the source of the
// BeginNavigation.)
bool parent_and_initiator_are_same =
(parent->GetRoutingID() == begin_params->initiator_routing_id) &&
(parent->GetProcess()->GetID() == GetProcess()->GetID());
base::debug::ScopedCrashKeyString parent_and_initiator_are_same_key(
parent_and_initiator_are_same_crash_key_string,
parent_and_initiator_are_same ? "true" : "false");
mojo::ReportBadMessage(
"RFHI: Mandatory Trust Tokens Feature Policy feature is absent");
return;
......
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