crash_keys: Convert site isolation keys to the new API.
- "killed_process_origin_lock"
- "requested_origin"
- "requested_site_url"
- "site_isolation_mode"
Bug: 598854
Change-Id: I7fd8c2762806ea7d46f42dbcc8e26381d98544cd
Reviewed-on: https://chromium-review.googlesource.com/817685
Commit-Queue: Robert Sesek <[email protected]>
Reviewed-by: Alex Moshchuk <[email protected]>
Cr-Commit-Position: refs/heads/master@{#522955}diff --git a/content/browser/site_instance_impl.cc b/content/browser/site_instance_impl.cc
index 827e674c..61b61fc5 100644
--- a/content/browser/site_instance_impl.cc
+++ b/content/browser/site_instance_impl.cc
@@ -566,9 +566,10 @@
HAS_WRONG_LOCK:
// We should never attempt to reassign a different origin lock to a
// process.
- base::debug::SetCrashKeyValue("requested_site_url", site_.spec());
- base::debug::SetCrashKeyValue(
- "killed_process_origin_lock",
+ base::debug::SetCrashKeyString(bad_message::GetRequestedSiteURLKey(),
+ site_.spec());
+ base::debug::SetCrashKeyString(
+ bad_message::GetKilledProcessOriginLockKey(),
policy->GetOriginLock(process_->GetID()).spec());
CHECK(false) << "Trying to lock a process to " << site_
<< " but the process is already locked to "
@@ -586,9 +587,10 @@
// If the site that we've just committed doesn't require a dedicated
// process, make sure we aren't putting it in a process for a site that
// does.
- base::debug::SetCrashKeyValue("requested_site_url", site_.spec());
- base::debug::SetCrashKeyValue(
- "killed_process_origin_lock",
+ base::debug::SetCrashKeyString(bad_message::GetRequestedSiteURLKey(),
+ site_.spec());
+ base::debug::SetCrashKeyString(
+ bad_message::GetKilledProcessOriginLockKey(),
policy->GetOriginLock(process_->GetID()).spec());
CHECK_EQ(lock_state,
ChildProcessSecurityPolicyImpl::CheckOriginLockResult::NO_LOCK)
