Merge "Revert "Remove DCHECK that does not work for gtests.""
am: 6fcb8b95e2

* commit '6fcb8b95e2ba60efde91e3558cb5a71e052919f7':
  Revert "Remove DCHECK that does not work for gtests."