Remove ScopedVector from autofill.

components/autofill/content/renderer/form_autofill_util.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/content/renderer/form_autofill_util.h"
 
 #include <map>
+#include <memory>
 #include <set>
+#include <vector>
 
 #include "base/command_line.h"
 #include "base/logging.h"
-#include "base/memory/scoped_vector.h"
+#include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "components/autofill/core/common/autofill_data_validation.h"
 #include "components/autofill/core/common/autofill_regexes.h"
 #include "components/autofill/core/common/autofill_switches.h"
 #include "components/autofill/core/common/autofill_util.h"
 #include "components/autofill/core/common/form_data.h"
@@ skipping 933 matching lines @@
 // |form_fields|. The extracted fields are also placed in |element_map|.
 // |form_fields| and |element_map| should start out empty.
 // |fields_extracted| should have as many elements as |control_elements|,
 // initialized to false.
 // Returns true if the number of fields extracted is within
 // [1, kMaxParseableFields].
 bool ExtractFieldsFromControlElements(
     const WebVector<WebFormControlElement>& control_elements,
     const FieldValueAndPropertiesMaskMap* field_value_and_properties_map,
     ExtractMask extract_mask,
-    ScopedVector<FormFieldData>* form_fields,
+    std::vector<std::unique_ptr<FormFieldData>>* form_fields,
     std::vector<bool>* fields_extracted,
     std::map<WebFormControlElement, FormFieldData*>* element_map) {
   DCHECK(form_fields->empty());
   DCHECK(element_map->empty());
   DCHECK_EQ(control_elements.size(), fields_extracted->size());
 
   for (size_t i = 0; i < control_elements.size(); ++i) {
     const WebFormControlElement& control_element = control_elements[i];
 
     if (!IsAutofillableElement(control_element))
       continue;
 
     // Create a new FormFieldData, fill it out and map it to the field's name.
     FormFieldData* form_field = new FormFieldData;
     WebFormControlElementToFormField(control_element,
                                      field_value_and_properties_map,
                                      extract_mask, form_field);
-    form_fields->push_back(form_field);
+    form_fields->push_back(base::WrapUnique(form_field));
     (*element_map)[control_element] = form_field;
     (*fields_extracted)[i] = true;
 
     // To avoid overly expensive computation, we impose a maximum number of
     // allowable fields.
     if (form_fields->size() > kMaxParseableFields)
       return false;
   }
 
   // Succeeded if fields were extracted.
@@ skipping 81 matching lines @@
   if (form_element)
     DCHECK(fieldsets.empty());
   if (field)
     DCHECK(form_control_element);
 
   // A map from a FormFieldData's name to the FormFieldData itself.
   std::map<WebFormControlElement, FormFieldData*> element_map;
 
   // The extracted FormFields. We use pointers so we can store them in
   // |element_map|.
-  ScopedVector<FormFieldData> form_fields;
+  std::vector<std::unique_ptr<FormFieldData>> form_fields;
 
   // A vector of bools that indicate whether each field in the form meets the
   // requirements and thus will be in the resulting |form|.
   std::vector<bool> fields_extracted(control_elements.size(), false);
 
   if (!ExtractFieldsFromControlElements(
           control_elements, field_value_and_properties_map, extract_mask,
           &form_fields, &fields_extracted, &element_map)) {
     return false;
   }
@@ skipping 48 matching lines @@
     }
     TruncateString(&form_fields[field_idx]->label, kMaxDataLength);
 
     if (field && *form_control_element == control_element)
       *field = *form_fields[field_idx];
 
     ++field_idx;
   }
 
   // Copy the created FormFields into the resulting FormData object.
-  for (const auto* iter : form_fields)
-    form->fields.push_back(*iter);
+  for (const auto& field : form_fields)
+    form->fields.push_back(*field);
   return true;
 }
 
 bool UnownedFormElementsAndFieldSetsToFormData(
     const std::vector<blink::WebElement>& fieldsets,
     const std::vector<blink::WebFormControlElement>& control_elements,
     const blink::WebFormControlElement* element,
     const blink::WebDocument& document,
     const FieldValueAndPropertiesMaskMap* field_value_and_properties_map,
     ExtractMask extract_mask,
@@ skipping 635 matching lines @@
     // Zero selection start is for password manager, which can show usernames
     // that do not begin with the user input value.
     selection_start = (offset == base::string16::npos) ? 0 : offset;
   }
 
   input_element->setSelectionRange(selection_start, suggestion.length());
 }
 
 }  // namespace form_util
 }  // namespace autofill