Remove ScopedVector from autofill::FormStructure

components/autofill/core/browser/form_field_unittest.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 "base/memory/scoped_vector.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_field.h"
 #include "components/autofill/core/browser/form_field.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::ASCIIToUTF16;
 
 namespace autofill {
 
@@ skipping 101 matching lines @@
   EXPECT_FALSE(FormField::Match(&field, ASCIIToUTF16("\\bcon\\b"),
                                 FormField::MATCH_LABEL));
   // Make sure the circumflex in 'crepe' is not treated as a word boundary.
   field.label = base::UTF8ToUTF16("cr" "\xC3\xAA" "pe");
   EXPECT_FALSE(FormField::Match(&field, ASCIIToUTF16("\\bcr\\b"),
                                 FormField::MATCH_LABEL));
 }
 
 // Test that we ignore checkable elements.
 TEST(FormFieldTest, ParseFormFields) {
-  ScopedVector<AutofillField> fields;
+  std::vector<std::unique_ptr<AutofillField>> fields;
   FormFieldData field_data;
   field_data.form_control_type = "text";
 
   field_data.label = ASCIIToUTF16("Address line1");
-  fields.push_back(new AutofillField(field_data, field_data.label));
+  fields.push_back(
+      base::MakeUnique<AutofillField>(field_data, field_data.label));
 
   field_data.check_status = FormFieldData::CHECKABLE_BUT_UNCHECKED;
   field_data.label = ASCIIToUTF16("Is PO Box");
-  fields.push_back(new AutofillField(field_data, field_data.label));
+  fields.push_back(
+      base::MakeUnique<AutofillField>(field_data, field_data.label));
 
   // reset |is_checkable| to false.
   field_data.check_status = FormFieldData::NOT_CHECKABLE;
 
   field_data.label = ASCIIToUTF16("Address line2");
-  fields.push_back(new AutofillField(field_data, field_data.label));
+  fields.push_back(
+      base::MakeUnique<AutofillField>(field_data, field_data.label));
 
   // Does not parse since there are only 2 recognized fields.
-  ASSERT_TRUE(FormField::ParseFormFields(fields.get(), true).empty());
+  ASSERT_TRUE(FormField::ParseFormFields(fields, true).empty());
 
   field_data.label = ASCIIToUTF16("City");
-  fields.push_back(new AutofillField(field_data, field_data.label));
+  fields.push_back(
+      base::MakeUnique<AutofillField>(field_data, field_data.label));
 
   // Checkable element shouldn't interfere with inference of Address line2.
   const FieldCandidatesMap field_candidates_map =
-      FormField::ParseFormFields(fields.get(), true);
+      FormField::ParseFormFields(fields, true);
   ASSERT_EQ(3U, field_candidates_map.size());
 
   EXPECT_EQ(ADDRESS_HOME_LINE1,
             field_candidates_map.find(ASCIIToUTF16("Address line1"))
                 ->second.BestHeuristicType());
   EXPECT_EQ(ADDRESS_HOME_LINE2,
             field_candidates_map.find(ASCIIToUTF16("Address line2"))
                 ->second.BestHeuristicType());
 }
 
 // All parsers see the same form and should not modify it.
 // Furthermore, all parsers are allowed to cast their votes on what the
 // ServerFieldType for a given type should be, so for an ambiguous input more
 // than one candidate is expected.
 TEST(FormFieldTest, ParseFormFieldsImmutableForm) {
   const base::string16 unique_name = ASCIIToUTF16("blah");
   FormFieldData field_data;
   field_data.form_control_type = "text";
   field_data.name = ASCIIToUTF16("business_email_address");
 
-  ScopedVector<AutofillField> fields;
-  fields.push_back(new AutofillField(field_data, unique_name));
+  std::vector<std::unique_ptr<AutofillField>> fields;
+  fields.push_back(base::MakeUnique<AutofillField>(field_data, unique_name));
 
   const FieldCandidatesMap field_candidates_map =
-      FormField::ParseFormFields(fields.get(), true);
+      FormField::ParseFormFields(fields, true);
 
   // The input form should not be modified.
   EXPECT_EQ(1U, fields.size());
 
   // The output should contain detected information for the sole field in the
   // input.
   EXPECT_EQ(1U, field_candidates_map.size());
   EXPECT_TRUE(field_candidates_map.find(unique_name) !=
               field_candidates_map.end());
 
   // Because we use a handcrafted field name, we can expect it to match more
   // than just one parser (at least email, but probably some more from the other
   // parsers).
   EXPECT_LT(1U, field_candidates_map.at(unique_name).field_candidates().size());
 }
 
 }  // namespace autofill