Style cleanups in Autofill for greater code clarity.

components/autofill/core/browser/form_structure.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/form_structure.h"
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 345 matching lines @@
       source_url_(form.origin),
       target_url_(form.action),
       autofill_count_(0),
       active_field_count_(0),
       upload_required_(USE_UPLOAD_RATES),
       has_author_specified_types_(false),
       has_password_field_(false),
       is_form_tag_(form.is_form_tag) {
   // Copy the form fields.
   std::map<base::string16, size_t> unique_names;
-  for (std::vector<FormFieldData>::const_iterator field =
-           form.fields.begin();
-       field != form.fields.end(); ++field) {
-    if (!ShouldSkipField(*field)) {
+  for (const FormFieldData& field : form.fields) {
+    if (!ShouldSkipField(field)) {
       // Add all supported form fields (including with empty names) to the
       // signature.  This is a requirement for Autofill servers.
       form_signature_field_names_.append("&");
-      form_signature_field_names_.append(StripDigitsIfRequired(field->name));
+      form_signature_field_names_.append(StripDigitsIfRequired(field.name));
 
       ++active_field_count_;
     }
 
-    if (field->form_control_type == "password")
+    if (field.form_control_type == "password")
       has_password_field_ = true;
 
     // Generate a unique name for this field by appending a counter to the name.
     // Make sure to prepend the counter with a non-numeric digit so that we are
     // guaranteed to avoid collisions.
-    if (!unique_names.count(field->name))
-      unique_names[field->name] = 1;
-    else
-      ++unique_names[field->name];
-    base::string16 unique_name = field->name + base::ASCIIToUTF16("_") +
-        base::IntToString16(unique_names[field->name]);
-    fields_.push_back(new AutofillField(*field, unique_name));
+    base::string16 unique_name =
+        field.name + base::ASCIIToUTF16("_") +
+        base::IntToString16(++unique_names[field.name]);
+    fields_.push_back(new AutofillField(field, unique_name));
   }
 }
 
 FormStructure::~FormStructure() {}
 
 void FormStructure::DetermineHeuristicTypes() {
   // First, try to detect field types based on each field's |autocomplete|
   // attribute value.  If there is at least one form field that specifies an
   // autocomplete type hint, don't try to apply other heuristics to match fields
   // in this form.
@@ skipping 886 matching lines @@
   for (AutofillField* field : fields_) {
     FieldTypeGroup field_type_group = field->Type().group();
     if (field_type_group == CREDIT_CARD)
       field->set_section(field->section() + "-cc");
     else
       field->set_section(field->section() + "-default");
   }
 }
 
 }  // namespace autofill