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

components/autofill/core/browser/phone_field_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 "components/autofill/core/browser/phone_field.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 61 matching lines @@
 TEST_F(PhoneFieldTest, NonParse) {
   list_.push_back(new AutofillField);
   AutofillScanner scanner(list_.get());
   field_ = Parse(&scanner);
   ASSERT_EQ(nullptr, field_.get());
 }
 
 TEST_F(PhoneFieldTest, ParseOneLinePhone) {
   FormFieldData field;
 
-  for (size_t i = 0; i < arraysize(kFieldTypes); ++i) {
+  for (const char* field_type : kFieldTypes) {
     Clear();
 
-    field.form_control_type = kFieldTypes[i];
+    field.form_control_type = field_type;
     field.label = ASCIIToUTF16("Phone");
     field.name = ASCIIToUTF16("phone");
     list_.push_back(new AutofillField(field, ASCIIToUTF16("phone1")));
 
     AutofillScanner scanner(list_.get());
     field_ = Parse(&scanner);
     ASSERT_NE(nullptr, field_.get());
     field_->AddClassifications(&field_candidates_map_);
     CheckField("phone1", PHONE_HOME_WHOLE_NUMBER);
   }
 }
 
 TEST_F(PhoneFieldTest, ParseTwoLinePhone) {
   FormFieldData field;
 
-  for (size_t i = 0; i < arraysize(kFieldTypes); ++i) {
+  for (const char* field_type : kFieldTypes) {
     Clear();
 
-    field.form_control_type = kFieldTypes[i];
+    field.form_control_type = field_type;
     field.label = ASCIIToUTF16("Area Code");
     field.name = ASCIIToUTF16("area code");
     list_.push_back(new AutofillField(field, ASCIIToUTF16("areacode1")));
 
     field.label = ASCIIToUTF16("Phone");
     field.name = ASCIIToUTF16("phone");
     list_.push_back(new AutofillField(field, ASCIIToUTF16("phone2")));
 
     AutofillScanner scanner(list_.get());
     field_ = Parse(&scanner);
     ASSERT_NE(nullptr, field_.get());
     field_->AddClassifications(&field_candidates_map_);
     CheckField("areacode1", PHONE_HOME_CITY_CODE);
     CheckField("phone2", PHONE_HOME_NUMBER);
   }
 }
 
 TEST_F(PhoneFieldTest, ThreePartPhoneNumber) {
   // Phone in format <field> - <field> - <field> could be either
   // <area code> - <prefix> - <suffix>, or
   // <country code> - <area code> - <phone>. The only distinguishing feature is
   // size: <prefix> is no bigger than 3 characters, and <suffix> is no bigger
   // than 4.
   FormFieldData field;
 
-  for (size_t i = 0; i < arraysize(kFieldTypes); ++i) {
+  for (const char* field_type : kFieldTypes) {
     Clear();
 
-    field.form_control_type = kFieldTypes[i];
+    field.form_control_type = field_type;
     field.label = ASCIIToUTF16("Phone:");
     field.name = ASCIIToUTF16("dayphone1");
     field.max_length = 0;
     list_.push_back(new AutofillField(field, ASCIIToUTF16("areacode1")));
 
     field.label = ASCIIToUTF16("-");
     field.name = ASCIIToUTF16("dayphone2");
     field.max_length = 3;
     list_.push_back(new AutofillField(field, ASCIIToUTF16("prefix2")));
 
@@ skipping 17 matching lines @@
     EXPECT_TRUE(base::ContainsKey(field_candidates_map_, ASCIIToUTF16("ext4")));
   }
 }
 
 // This scenario of explicitly labeled "prefix" and "suffix" phone numbers
 // encountered in http://crbug.com/40694 with page
 // https://www.wrapables.com/jsp/Signup.jsp.
 TEST_F(PhoneFieldTest, ThreePartPhoneNumberPrefixSuffix) {
   FormFieldData field;
 
-  for (size_t i = 0; i < arraysize(kFieldTypes); ++i) {
+  for (const char* field_type : kFieldTypes) {
     Clear();
 
-    field.form_control_type = kFieldTypes[i];
+    field.form_control_type = field_type;
     field.label = ASCIIToUTF16("Phone:");
     field.name = ASCIIToUTF16("area");
     list_.push_back(new AutofillField(field, ASCIIToUTF16("areacode1")));
 
     field.label = base::string16();
     field.name = ASCIIToUTF16("prefix");
     list_.push_back(new AutofillField(field, ASCIIToUTF16("prefix2")));
 
     field.label = base::string16();
     field.name = ASCIIToUTF16("suffix");
     list_.push_back(new AutofillField(field, ASCIIToUTF16("suffix3")));
 
     AutofillScanner scanner(list_.get());
     field_ = Parse(&scanner);
     ASSERT_NE(nullptr, field_.get());
     field_->AddClassifications(&field_candidates_map_);
     CheckField("areacode1", PHONE_HOME_CITY_CODE);
     CheckField("prefix2", PHONE_HOME_NUMBER);
     CheckField("suffix3", PHONE_HOME_NUMBER);
   }
 }
 
 TEST_F(PhoneFieldTest, ThreePartPhoneNumberPrefixSuffix2) {
   FormFieldData field;
 
-  for (size_t i = 0; i < arraysize(kFieldTypes); ++i) {
+  for (const char* field_type : kFieldTypes) {
     Clear();
 
-    field.form_control_type = kFieldTypes[i];
+    field.form_control_type = field_type;
     field.label = ASCIIToUTF16("(");
     field.name = ASCIIToUTF16("phone1");
     field.max_length = 3;
     list_.push_back(new AutofillField(field, ASCIIToUTF16("phone1")));
 
     field.label = ASCIIToUTF16(")");
     field.name = ASCIIToUTF16("phone2");
     field.max_length = 3;
     list_.push_back(new AutofillField(field, ASCIIToUTF16("phone2")));
 
@@ skipping 10 matching lines @@
     CheckField("phone2", PHONE_HOME_NUMBER);
     CheckField("phone3", PHONE_HOME_NUMBER);
   }
 }
 
 TEST_F(PhoneFieldTest, CountryAndCityAndPhoneNumber) {
   // Phone in format <country code>:3 - <city and number>:10
   // The |maxlength| is considered, otherwise it's too broad.
   FormFieldData field;
 
-  for (size_t i = 0; i < arraysize(kFieldTypes); ++i) {
+  for (const char* field_type : kFieldTypes) {
     Clear();
 
-    field.form_control_type = kFieldTypes[i];
+    field.form_control_type = field_type;
     field.label = ASCIIToUTF16("Phone Number");
     field.name = ASCIIToUTF16("CountryCode");
     field.max_length = 3;
     list_.push_back(new AutofillField(field, ASCIIToUTF16("country")));
 
     field.label = ASCIIToUTF16("Phone Number");
     field.name = ASCIIToUTF16("PhoneNumber");
     field.max_length = 10;
     list_.push_back(new AutofillField(field, ASCIIToUTF16("phone")));
 
     AutofillScanner scanner(list_.get());
     field_ = Parse(&scanner);
     ASSERT_NE(nullptr, field_.get());
     field_->AddClassifications(&field_candidates_map_);
     CheckField("country", PHONE_HOME_COUNTRY_CODE);
     CheckField("phone", PHONE_HOME_CITY_AND_NUMBER);
   }
 }
 
 }  // namespace autofill