In tests, use ASSERT_NO_FATAL_FAILURE()

util/mac/mac_util_test.mm

 // 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 23 matching lines @@
 #undef catch
 #endif
 
 namespace crashpad {
 namespace test {
 namespace {
 
 // Runs /usr/bin/sw_vers with a single argument, |argument|, and places the
 // command’s standard output into |output| after stripping the trailing newline.
 // Fatal gtest assertions report tool failures, which the caller should check
-// for with testing::Test::HasFatalFailure().
+// for with ASSERT_NO_FATAL_FAILURE() or testing::Test::HasFatalFailure().
 void SwVers(NSString* argument, std::string* output) {
   @autoreleasepool {
     base::scoped_nsobject<NSPipe> pipe([[NSPipe alloc] init]);
     base::scoped_nsobject<NSTask> task([[NSTask alloc] init]);
     [task setStandardOutput:pipe];
     [task setLaunchPath:@"/usr/bin/sw_vers"];
     [task setArguments:@[ argument ]];
 
     @try {
       [task launch];
@@ skipping 28 matching lines @@
 
   std::string version;
   if (bugfix) {
     version = base::StringPrintf("%d.%d.%d", major, minor, bugfix);
   } else {
     // 10.x.0 releases report their version string as simply 10.x.
     version = base::StringPrintf("%d.%d", major, minor);
   }
 
   std::string expected_product_version;
-  SwVers(@"-productVersion", &expected_product_version);
-  if (Test::HasFatalFailure()) {
-    return;
-  }
+  ASSERT_NO_FATAL_FAILURE(
+      SwVers(@"-productVersion", &expected_product_version));
 
   EXPECT_EQ(expected_product_version, version);
 
   std::string expected_build_version;
-  SwVers(@"-buildVersion", &expected_build_version);
-  if (Test::HasFatalFailure()) {
-    return;
-  }
+  ASSERT_NO_FATAL_FAILURE(SwVers(@"-buildVersion", &expected_build_version));
 
   EXPECT_EQ(expected_build_version, build);
 
   std::string expected_product_name;
-  SwVers(@"-productName", &expected_product_name);
-  if (Test::HasFatalFailure()) {
-    return;
-  }
+  ASSERT_NO_FATAL_FAILURE(SwVers(@"-productName", &expected_product_name));
 
   // Look for a space after the product name in the complete version string.
   expected_product_name += ' ';
   EXPECT_EQ(0u, version_string.find(expected_product_name));
 }
 
 TEST(MacUtil, MacOSXMinorVersion) {
   // Make sure that MacOSXMinorVersion() and MacOSXVersion() agree. The two have
   // their own distinct implementations, and the latter was checked against
   // sw_vers above.
@@ skipping 19 matching lines @@
   std::string board;
   MacModelAndBoard(&model, &board);
 
   EXPECT_FALSE(model.empty());
   EXPECT_FALSE(board.empty());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad