Remove ScopedVector from autofill::FormStructure

components/autofill/core/browser/autofill_manager.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/autofill_manager.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 1105 matching lines @@
       "dump-autofill-data");
 
   // Save the form data for future dumping.
   if (dump_data) {
     if (recently_autofilled_forms_.size() > 5)
       recently_autofilled_forms_.erase(recently_autofilled_forms_.begin());
 
     recently_autofilled_forms_.push_back(
         std::map<std::string, base::string16>());
     auto& map = recently_autofilled_forms_.back();
-    for (const auto* field : submitted_form) {
+    for (const auto& field : submitted_form) {
       AutofillType type = field->Type();
       // Even though this is for development only, mask full credit card #'s.
       if (type.GetStorableType() == CREDIT_CARD_NUMBER &&
           field->value.size() > 4) {
         map[type.ToString()] = base::ASCIIToUTF16("...(omitted)...") +
                                field->value.substr(field->value.size() - 4, 4);
       } else {
         map[type.ToString()] = field->value;
       }
     }
@@ skipping 20 matching lines @@
     // this block can be reached on observing either a new card or one already
     // stored locally. We will offer to upload either kind.
     upload_request_ = payments::PaymentsClient::UploadRequestDetails();
     upload_request_.card = *imported_credit_card;
 
     // Check for a CVC to determine whether we can prompt the user to upload
     // their card. If no CVC is present, do nothing. We could fall back to a
     // local save but we believe that sometimes offering upload and sometimes
     // offering local save is a confusing user experience.
     int cvc;
-    for (const AutofillField* field : submitted_form) {
+    for (const auto& field : submitted_form) {
       if (field->Type().GetStorableType() == CREDIT_CARD_VERIFICATION_CODE &&
           base::StringToInt(field->value, &cvc)) {
         upload_request_.cvc = field->value;
         break;
       }
     }
     if (upload_request_.cvc.empty()) {
       AutofillMetrics::LogCardUploadDecisionMetric(
           AutofillMetrics::UPLOAD_NOT_OFFERED_NO_CVC);
       CollectRapportSample(submitted_form.source_url(),
@@ skipping 495 matching lines @@
   // necessary.
   if (!UpdateCachedForm(form, *form_structure, form_structure))
     return false;
 
   // No data to return if there are no auto-fillable fields.
   if (!(*form_structure)->autofill_count())
     return false;
 
   // Find the AutofillField that corresponds to |field|.
   *autofill_field = NULL;
-  for (AutofillField* current : **form_structure) {
+  for (const auto& current : **form_structure) {
     if (current->SameFieldAs(field)) {
-      *autofill_field = current;
+      *autofill_field = current.get();
       break;
     }
   }
 
   // Even though we always update the cache, the field might not exist if the
   // website disables autocomplete while the user is interacting with the form.
   // See http://crbug.com/160476
   return *autofill_field != NULL;
 }
 
@@ skipping 441 matching lines @@
     if (i > 0)
       fputs("Next oldest form:\n", file);
   }
   fputs("\n", file);
 
   fclose(file);
 }
 #endif  // ENABLE_FORM_DEBUG_DUMP
 
 }  // namespace autofill