Revert of Replace for loops with |arraysize| with for each loops

components/autofill/core/browser/address_unittest.cc

Index: components/autofill/core/browser/address_unittest.cc
diff --git a/components/autofill/core/browser/address_unittest.cc b/components/autofill/core/browser/address_unittest.cc
index d5e67b017208f4464ad0e065ade9de8971af8233..d178f04ff2143744e29357b2977c50d7e7bf75fd 100644
--- a/components/autofill/core/browser/address_unittest.cc
+++ b/components/autofill/core/browser/address_unittest.cc
@@ -132,10 +132,11 @@
     "United states",
     "us"
   };
-  for (const char* valid_match : kValidMatches) {
-    SCOPED_TRACE(valid_match);
+  for (size_t i = 0; i < arraysize(kValidMatches); ++i) {
+    SCOPED_TRACE(kValidMatches[i]);
     ServerFieldTypeSet matching_types;
-    address.GetMatchingTypes(ASCIIToUTF16(valid_match), "US", &matching_types);
+    address.GetMatchingTypes(ASCIIToUTF16(kValidMatches[i]), "US",
+                             &matching_types);
     ASSERT_EQ(1U, matching_types.size());
     EXPECT_EQ(ADDRESS_HOME_COUNTRY, *matching_types.begin());
   }
@@ -144,9 +145,9 @@
     "United",
     "Garbage"
   };
-  for (const char* invalid_match : kInvalidMatches) {
+  for (size_t i = 0; i < arraysize(kInvalidMatches); ++i) {
     ServerFieldTypeSet matching_types;
-    address.GetMatchingTypes(ASCIIToUTF16(invalid_match), "US",
+    address.GetMatchingTypes(ASCIIToUTF16(kInvalidMatches[i]), "US",
                              &matching_types);
     EXPECT_EQ(0U, matching_types.size());
   }