| Index: components/autofill/content/renderer/form_autofill_util.cc
|
| diff --git a/components/autofill/content/renderer/form_autofill_util.cc b/components/autofill/content/renderer/form_autofill_util.cc
|
| index 2c5dc0975a75cbede4ca43b0370b3520733f51b3..f2056c1579d8025af98a76d462481943adcaca7b 100644
|
| --- a/components/autofill/content/renderer/form_autofill_util.cc
|
| +++ b/components/autofill/content/renderer/form_autofill_util.cc
|
| @@ -5,11 +5,13 @@
|
| #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"
|
| @@ -963,7 +965,7 @@ 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());
|
| @@ -981,7 +983,7 @@ bool ExtractFieldsFromControlElements(
|
| 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;
|
|
|
| @@ -1083,7 +1085,7 @@ bool FormOrFieldsetsToFormData(
|
|
|
| // 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|.
|
| @@ -1152,8 +1154,8 @@ bool FormOrFieldsetsToFormData(
|
| }
|
|
|
| // 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;
|
| }
|
|
|
|
|