Fix ErrorUtils.FormatErrorMessage_Death in official builds.

ErrorUtils.FormatErrorMessage_Death fails on official builds because
failure messages aren't passed to CHECK in official builds. Modify the death
regex for the test in official builds and fix the test.

BUG=934831

Change-Id: I4b301410ce990e3ced014c5fa82c42d1fea98cce
Reviewed-on: https://chromium-review.googlesource.com/c/1483938
Auto-Submit: Karan Bhatia <karandeepb@chromium.org>
Commit-Queue: Devlin <rdevlin.cronin@chromium.org>
Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#634845}

extensions/common/error_utils_unittest.cc

@@ -50,15 +50,24 @@ TEST(ErrorUtils, FormatErrorMessage_Death) {
   } cases[] = {{"Hello * Bye * *", "arg1", "arg2", "More placeholders"},
                {"Hello * Bye", "arg1", "arg2", "Fewer placeholders"}};
 
+  auto get_death_regex = [](const char* death_message_regex) {
+// String arguments aren't passed to CHECK() in official builds.
+#if defined(OFFICIAL_BUILD) && defined(NDEBUG)
+    return "";
+#else
+    return death_message_regex;
+#endif
+  };
+
   for (const auto& test_case : cases) {
     SCOPED_TRACE(test_case.format);
 
     EXPECT_DEATH(ErrorUtils::FormatErrorMessage(test_case.format, test_case.s1,
                                                 test_case.s2),
-                 test_case.death_message_regex);
+                 get_death_regex(test_case.death_message_regex));
     EXPECT_DEATH(ErrorUtils::FormatErrorMessageUTF16(
                      test_case.format, test_case.s1, test_case.s2),
-                 test_case.death_message_regex);
+                 get_death_regex(test_case.death_message_regex));
   }
 }
 #endif  // defined(GTEST_HAS_DEATH_TEST)