Don't set crash keys if there's no crash in LockToOriginIfNeeded().

Bug: 837009
Change-Id: Ia239d85b546c2265e77564356d2c1a2e2fc3aa74
Reviewed-on: https://chromium-review.googlesource.com/1029006Reviewed-by: Nasko Oskov <nasko@chromium.org>
Commit-Queue: Alex Moshchuk <alexmos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#554607}

content/browser/site_instance_impl.cc

@@ -28,6 +28,9 @@ namespace content {
 
 int32_t SiteInstanceImpl::next_site_instance_id_ = 1;
 
+using CheckOriginLockResult =
+    ChildProcessSecurityPolicyImpl::CheckOriginLockResult;
+
 SiteInstanceImpl::SiteInstanceImpl(BrowsingInstance* browsing_instance)
     : id_(next_site_instance_id_++),
       active_frame_count_(0),
@@ -564,7 +567,7 @@ void SiteInstanceImpl::LockToOriginIfNeeded() {
     CHECK(!process_->IsForGuestsOnly());
 
     switch (lock_state) {
-      case ChildProcessSecurityPolicyImpl::CheckOriginLockResult::NO_LOCK: {
+      case CheckOriginLockResult::NO_LOCK: {
         // TODO(nick): When all sites are isolated, this operation provides
         // strong protection. If only some sites are isolated, we need
         // additional logic to prevent the non-isolated sites from requesting
@@ -572,8 +575,7 @@ void SiteInstanceImpl::LockToOriginIfNeeded() {
         policy->LockToOrigin(process_->GetID(), site_);
         break;
       }
-      case ChildProcessSecurityPolicyImpl::CheckOriginLockResult::
-          HAS_WRONG_LOCK:
+      case CheckOriginLockResult::HAS_WRONG_LOCK:
         // We should never attempt to reassign a different origin lock to a
         // process.
         base::debug::SetCrashKeyString(bad_message::GetRequestedSiteURLKey(),
@@ -585,8 +587,7 @@ void SiteInstanceImpl::LockToOriginIfNeeded() {
                      << " but the process is already locked to "
                      << policy->GetOriginLock(process_->GetID());
         break;
-      case ChildProcessSecurityPolicyImpl::CheckOriginLockResult::
-          HAS_EQUAL_LOCK:
+      case CheckOriginLockResult::HAS_EQUAL_LOCK:
         // Process already has the right origin lock assigned.  This case will
         // happen for commits to |site_| after the first one.
         break;
@@ -597,15 +598,16 @@ void SiteInstanceImpl::LockToOriginIfNeeded() {
     // 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::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)
-        << "Trying to commit non-isolated site " << site_
-        << " in process locked to " << policy->GetOriginLock(process_->GetID());
+    if (lock_state != CheckOriginLockResult::NO_LOCK) {
+      base::debug::SetCrashKeyString(bad_message::GetRequestedSiteURLKey(),
+                                     site_.spec());
+      base::debug::SetCrashKeyString(
+          bad_message::GetKilledProcessOriginLockKey(),
+          policy->GetOriginLock(process_->GetID()).spec());
+      CHECK(false) << "Trying to commit non-isolated site " << site_
+                   << " in process locked to "
+                   << policy->GetOriginLock(process_->GetID());
+    }
   }
 }