In tests, use ASSERT_NO_FATAL_FAILURE()

minidump/minidump_memory_writer_test.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 32 matching lines @@
   const size_t kMemoryListStreamOffset =
       kDirectoryOffset + expected_streams * sizeof(MINIDUMP_DIRECTORY);
   const size_t kMemoryDescriptorsOffset =
       kMemoryListStreamOffset + sizeof(MINIDUMP_MEMORY_LIST);
 
   ASSERT_GE(file_contents.size(), kMemoryDescriptorsOffset);
 
   const MINIDUMP_HEADER* header =
       reinterpret_cast<const MINIDUMP_HEADER*>(&file_contents[0]);
 
-  VerifyMinidumpHeader(header, expected_streams, 0);
-  if (testing::Test::HasFatalFailure()) {
-    return;
-  }
+  ASSERT_NO_FATAL_FAILURE(VerifyMinidumpHeader(header, expected_streams, 0));
 
   const MINIDUMP_DIRECTORY* directory =
       reinterpret_cast<const MINIDUMP_DIRECTORY*>(
           &file_contents[kDirectoryOffset]);
 
   if (expected_streams > 1) {
     ASSERT_EQ(kBogusStreamType, directory->StreamType);
     ASSERT_EQ(0u, directory->Location.DataSize);
     ASSERT_EQ(kMemoryListStreamOffset, directory->Location.Rva);
     ++directory;
@@ skipping 19 matching lines @@
   minidump_file_writer.AddStream(&memory_list_writer);
 
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
 
   ASSERT_EQ(sizeof(MINIDUMP_HEADER) + sizeof(MINIDUMP_DIRECTORY) +
                 sizeof(MINIDUMP_MEMORY_LIST),
             file_writer.string().size());
 
   const MINIDUMP_MEMORY_LIST* memory_list;
-  GetMemoryListStream(file_writer.string(), &memory_list, 1);
-  if (Test::HasFatalFailure()) {
-    return;
-  }
+  ASSERT_NO_FATAL_FAILURE(
+      GetMemoryListStream(file_writer.string(), &memory_list, 1));
 
   EXPECT_EQ(0u, memory_list->NumberOfMemoryRanges);
 }
 
 TEST(MinidumpMemoryWriter, OneMemoryRegion) {
   MinidumpFileWriter minidump_file_writer;
   MinidumpMemoryListWriter memory_list_writer;
 
   const uint64_t kBaseAddress = 0xfedcba9876543210;
   const uint64_t kSize = 0x1000;
   const uint8_t kValue = 'm';
 
   TestMinidumpMemoryWriter memory_writer(kBaseAddress, kSize, kValue);
   memory_list_writer.AddMemory(&memory_writer);
 
   minidump_file_writer.AddStream(&memory_list_writer);
 
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
 
   const MINIDUMP_MEMORY_LIST* memory_list;
-  GetMemoryListStream(file_writer.string(), &memory_list, 1);
-  if (Test::HasFatalFailure()) {
-    return;
-  }
+  ASSERT_NO_FATAL_FAILURE(
+      GetMemoryListStream(file_writer.string(), &memory_list, 1));
 
   MINIDUMP_MEMORY_DESCRIPTOR expected;
   expected.StartOfMemoryRange = kBaseAddress;
   expected.Memory.DataSize = kSize;
   expected.Memory.Rva =
       sizeof(MINIDUMP_HEADER) + sizeof(MINIDUMP_DIRECTORY) +
       sizeof(MINIDUMP_MEMORY_LIST) +
       memory_list->NumberOfMemoryRanges * sizeof(MINIDUMP_MEMORY_DESCRIPTOR);
   ExpectMinidumpMemoryDescriptorAndContents(&expected,
                                             &memory_list->MemoryRanges[0],
@@ skipping 17 matching lines @@
   memory_list_writer.AddMemory(&memory_writer_1);
   TestMinidumpMemoryWriter memory_writer_2(kBaseAddress2, kSize2, kValue2);
   memory_list_writer.AddMemory(&memory_writer_2);
 
   minidump_file_writer.AddStream(&memory_list_writer);
 
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
 
   const MINIDUMP_MEMORY_LIST* memory_list;
-  GetMemoryListStream(file_writer.string(), &memory_list, 1);
-  if (Test::HasFatalFailure()) {
-    return;
-  }
+  ASSERT_NO_FATAL_FAILURE(
+      GetMemoryListStream(file_writer.string(), &memory_list, 1));
 
   EXPECT_EQ(2u, memory_list->NumberOfMemoryRanges);
 
   MINIDUMP_MEMORY_DESCRIPTOR expected;
 
   {
     SCOPED_TRACE("region 0");
 
     expected.StartOfMemoryRange = kBaseAddress1;
     expected.Memory.DataSize = kSize1;
@@ skipping 83 matching lines @@
 
   TestMinidumpMemoryWriter memory_writer(kBaseAddress2, kSize2, kValue2);
   memory_list_writer.AddMemory(&memory_writer);
 
   minidump_file_writer.AddStream(&memory_list_writer);
 
   StringFileWriter file_writer;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&file_writer));
 
   const MINIDUMP_MEMORY_LIST* memory_list;
-  GetMemoryListStream(file_writer.string(), &memory_list, 2);
-  if (Test::HasFatalFailure()) {
-    return;
-  }
+  ASSERT_NO_FATAL_FAILURE(
+      GetMemoryListStream(file_writer.string(), &memory_list, 2));
 
   EXPECT_EQ(2u, memory_list->NumberOfMemoryRanges);
 
   MINIDUMP_MEMORY_DESCRIPTOR expected;
 
   {
     SCOPED_TRACE("region 0");
 
     expected.StartOfMemoryRange = kBaseAddress1;
     expected.Memory.DataSize = kSize1;
@@ skipping 19 matching lines @@
                                               &memory_list->MemoryRanges[1],
                                               file_writer.string(),
                                               kValue2,
                                               true);
   }
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad