Revert of Update re2

third_party/re2/re2/testing/re2_arg_test.cc

Index: third_party/re2/re2/testing/re2_arg_test.cc
diff --git a/third_party/re2/re2/testing/re2_arg_test.cc b/third_party/re2/re2/testing/re2_arg_test.cc
index d843ffa5fadd9d5eb0e9a2c447b8bdae6ad15a95..ae7a7b0dc5065178f9ca8c8dd52a7420cc59a00b 100644
--- a/third_party/re2/re2/testing/re2_arg_test.cc
+++ b/third_party/re2/re2/testing/re2_arg_test.cc
@@ -84,24 +84,24 @@
 { "18446744073709551616", 0,    { false, false, false, false, false, false }},
 };
 
-const int kNumStrings = arraysize(kSuccessTable);
+const int kNumStrings = ARRAYSIZE(kSuccessTable);
 
-// It's ugly to use a macro, but we apparently can't use the EXPECT_EQ
+// It's ugly to use a macro, but we apparently can't use the ASSERT_TRUE_M
 // macro outside of a TEST block and this seems to be the only way to
 // avoid code duplication.  I can also pull off a couple nice tricks
 // using concatenation for the type I'm checking against.
 #define PARSE_FOR_TYPE(type, column) {                                   \
   type r;                                                                \
-  for (int i = 0; i < kNumStrings; ++i) {                                \
+  for ( int i = 0; i < kNumStrings; ++i ) {                              \
     RE2::Arg arg(&r);                                                    \
     const char* const p = kSuccessTable[i].value_string;                 \
-    bool retval = arg.Parse(p, static_cast<int>(strlen(p)));             \
+    bool retval = arg.Parse(p, strlen(p));                               \
     bool success = kSuccessTable[i].success[column];                     \
-    EXPECT_EQ(retval, success)                                           \
-        << "Parsing '" << p << "' for type " #type " should return "     \
-        << success;                                                      \
-    if (success) {                                                       \
-      EXPECT_EQ(r, (type)kSuccessTable[i].value);                        \
+    ASSERT_TRUE_M(retval == success,                                     \
+      StringPrintf("Parsing '%s' for type " #type " should return %d",   \
+                   p, success).c_str());                                 \
+    if ( success ) {                                                     \
+      ASSERT_EQUALS(r, kSuccessTable[i].value);                          \
     }                                                                    \
   }                                                                      \
 }