Reland of place for loops with |arraysize| with for each loops

components/autofill/core/browser/phone_number_i18n_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 106 matching lines @@
         // Parses vanity numbers.
         {true, "1-650-FLOWERS", "US", "3569377", "650", "1", "US"},
         // 800 is not an area code, but the destination code. In our library
         // these
         // codes should be treated the same as area codes.
         {true, "1-800-FLOWERS", "US", "3569377", "800", "1", "US"},
         // Don't add a country code where there was none.
         {true, "(08) 450 777 7777", "DE", "7777777", "8450", "", "DE"},
     };
 
-  for (size_t i = 0; i < arraysize(test_cases); ++i) {
-    SCOPED_TRACE("Testing phone number " + test_cases[i].input);
+  for (const auto& test_case : test_cases) {
+    SCOPED_TRACE("Testing phone number " + test_case.input);
 
     base::string16 country_code, city_code, number;
     std::string deduced_region;
     ::i18n::phonenumbers::PhoneNumber unused_i18n_number;
-    EXPECT_EQ(test_cases[i].valid,
-              ParsePhoneNumber(ASCIIToUTF16(test_cases[i].input),
-                               test_cases[i].assumed_region,
-                               &country_code,
-                               &city_code,
-                               &number,
-                               &deduced_region,
-                               &unused_i18n_number));
-    EXPECT_EQ(ASCIIToUTF16(test_cases[i].number), number);
-    EXPECT_EQ(ASCIIToUTF16(test_cases[i].city_code), city_code);
-    EXPECT_EQ(ASCIIToUTF16(test_cases[i].country_code), country_code);
-    EXPECT_EQ(test_cases[i].deduced_region, deduced_region);
+    EXPECT_EQ(
+        test_case.valid,
+        ParsePhoneNumber(ASCIIToUTF16(test_case.input),
+                         test_case.assumed_region, &country_code, &city_code,
+                         &number, &deduced_region, &unused_i18n_number));
+    EXPECT_EQ(ASCIIToUTF16(test_case.number), number);
+    EXPECT_EQ(ASCIIToUTF16(test_case.city_code), city_code);
+    EXPECT_EQ(ASCIIToUTF16(test_case.country_code), country_code);
+    EXPECT_EQ(test_case.deduced_region, deduced_region);
   }
 }
 
 TEST(PhoneNumberI18NTest, ConstructPhoneNumber) {
   base::string16 number;
   EXPECT_TRUE(ConstructPhoneNumber(ASCIIToUTF16("1"),
                                    ASCIIToUTF16("650"),
                                    ASCIIToUTF16("2345678"),
                                    "US",
                                    &number));
@@ skipping 98 matching lines @@
                                  "en-US"));
 
   // Different numbers don't match.
   EXPECT_FALSE(PhoneNumbersMatch(ASCIIToUTF16("14158889999"),
                                  ASCIIToUTF16("1415888"),
                                  "US",
                                  "en-US"));
 }
 
 }  // namespace autofill