Remove ScopedVector from autofill::FormStructure

components/autofill/core/browser/form_field.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_field.h"
 
 #include <algorithm>
 #include <cstddef>
 #include <iterator>
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/address_field.h"
 #include "components/autofill/core/browser/autofill_field.h"
 #include "components/autofill/core/browser/autofill_scanner.h"
 #include "components/autofill/core/browser/credit_card_field.h"
 #include "components/autofill/core/browser/email_field.h"
 #include "components/autofill/core/browser/form_structure.h"
 #include "components/autofill/core/browser/name_field.h"
 #include "components/autofill/core/browser/phone_field.h"
 #include "components/autofill/core/common/autofill_regexes.h"
 #include "components/autofill/core/common/autofill_util.h"
 
 namespace autofill {
-namespace {
-
-bool ShouldBeProcessed(const AutofillField* field) {
-  // Ignore checkable fields as they interfere with parsers assuming context.
-  // Eg., while parsing address, "Is PO box" checkbox after ADDRESS_LINE1
-  // interferes with correctly understanding ADDRESS_LINE2.
-  // Ignore fields marked as presentational. See
-  // http://www.w3.org/TR/wai-aria/roles#presentation
-  return !(IsCheckable(field->check_status) ||
-           field->role == FormFieldData::ROLE_ATTRIBUTE_PRESENTATION);
-}
-
-}  // namespace
 
 // There's an implicit precedence determined by the values assigned here. Email
 // is currently the most important followed by Phone, Address, Credit Card and
 // finally Name.
 const float FormField::kBaseEmailParserScore = 1.4f;
 const float FormField::kBasePhoneParserScore = 1.3f;
 const float FormField::kBaseAddressParserScore = 1.2f;
 const float FormField::kBaseCreditCardParserScore = 1.1f;
 const float FormField::kBaseNameParserScore = 1.0f;
 
 // static
 FieldCandidatesMap FormField::ParseFormFields(
-    const std::vector<AutofillField*>& fields,
+    const std::vector<std::unique_ptr<AutofillField>>& fields,
     bool is_form_tag) {
   // Set up a working copy of the fields to be processed.
   std::vector<AutofillField*> processed_fields;
-  std::copy_if(fields.begin(), fields.end(),
-               std::back_inserter(processed_fields), ShouldBeProcessed);
+  for (const auto& field : fields) {
+    // Ignore checkable fields as they interfere with parsers assuming context.
+    // Eg., while parsing address, "Is PO box" checkbox after ADDRESS_LINE1
+    // interferes with correctly understanding ADDRESS_LINE2.
+    // Ignore fields marked as presentational. See
+    // http://www.w3.org/TR/wai-aria/roles#presentation
+    if (!(IsCheckable(field->check_status) ||
+          field->role == FormFieldData::ROLE_ATTRIBUTE_PRESENTATION)) {
+      processed_fields.push_back(field.get());
+    }
+  }
 
   FieldCandidatesMap field_candidates;
 
   // Email pass.
   ParseFormFieldsPass(EmailField::Parse, processed_fields, &field_candidates);
   const size_t email_count = field_candidates.size();
 
   // Phone pass.
   ParseFormFieldsPass(PhoneField::Parse, processed_fields, &field_candidates);
 
@@ skipping 135 matching lines @@
   if ((match_type & MATCH_PASSWORD) && type == "password")
     return true;
 
   if ((match_type & MATCH_NUMBER) && type == "number")
     return true;
 
   return false;
 }
 
 }  // namespace autofill