Change EXPECT/ASSERT_DCHECK_DEATH macro to not expose the |regex| parameter.

base/task_scheduler/scheduler_lock_impl.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/task_scheduler/scheduler_lock_impl.h"
 
 #include <algorithm>
 #include <unordered_map>
 #include <vector>
 
@@ skipping 49 matching lines @@
   void AssertSafeAcquire(const SchedulerLockImpl* const lock) {
     const LockVector* acquired_locks = GetAcquiredLocksOnCurrentThread();
 
     // If the thread currently holds no locks, this is inherently safe.
     if (acquired_locks->empty())
       return;
 
     // Otherwise, make sure that the previous lock acquired is an allowed
     // predecessor.
     AutoLock auto_lock(allowed_predecessor_map_lock_);
+    // Using at() is exception-safe here as |lock| was registered already.
     const SchedulerLockImpl* allowed_predecessor =
         allowed_predecessor_map_.at(lock);
     DCHECK_EQ(acquired_locks->back(), allowed_predecessor);
   }
 
+  // This asserts that lock's registered predecessor is safe. Since registration

[robliao, 2016/08/04 17:25:20]

This change should be pulled out of this CL. Nice find! Logic looks good to me.

[gab, 2016/08/04 17:43:05]

Done: https://codereview.chromium.org/2218443002/

+  // only happens at construction time, the predecessor is safe (no cycle
+  // possible) as long as it is either null or already registered.
   void AssertSafePredecessor(const SchedulerLockImpl* lock) const {
     allowed_predecessor_map_lock_.AssertAcquired();
-    for (const SchedulerLockImpl* predecessor =
-             allowed_predecessor_map_.at(lock);
-         predecessor != nullptr;
-         predecessor = allowed_predecessor_map_.at(predecessor)) {
-      DCHECK_NE(predecessor, lock) <<
-          "Scheduler lock predecessor cycle detected.";
+    // Using at() is exception-safe here as |lock| was registered already.
+    const SchedulerLockImpl* predecessor = allowed_predecessor_map_.at(lock);
+    if (predecessor) {
+      DCHECK(allowed_predecessor_map_.find(predecessor) !=
+             allowed_predecessor_map_.end())
+          << "SchedulerLock was registered before its predecessor. "
+          << "Potential cycle detected";
     }
   }
 
   LockVector* GetAcquiredLocksOnCurrentThread() {
     if (!tls_acquired_locks_.Get())
       tls_acquired_locks_.Set(new LockVector);
 
     return reinterpret_cast<LockVector*>(tls_acquired_locks_.Get());
   }
 
@@ skipping 43 matching lines @@
   lock_.AssertAcquired();
 }
 
 std::unique_ptr<ConditionVariable>
 SchedulerLockImpl::CreateConditionVariable() {
   return std::unique_ptr<ConditionVariable>(new ConditionVariable(&lock_));
 }
 
 }  // namespace internal
 }  // base