Remove ScopedVector from autofill.

components/autofill/core/browser/phone_field_unittest.cc

Index: components/autofill/core/browser/phone_field_unittest.cc
diff --git a/components/autofill/core/browser/phone_field_unittest.cc b/components/autofill/core/browser/phone_field_unittest.cc
index f270cbfa104107b56aeabb547e150cc2dd01f222..868bb69675f4a879fb1f879c8302c45833d5fe1e 100644
--- a/components/autofill/core/browser/phone_field_unittest.cc
+++ b/components/autofill/core/browser/phone_field_unittest.cc
@@ -7,10 +7,10 @@
 #include <stddef.h>
 
 #include <memory>
+#include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
-#include "base/memory/scoped_vector.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_field.h"
@@ -56,7 +56,7 @@ class PhoneFieldTest : public testing::Test {
     EXPECT_EQ(expected_type, it->second.BestHeuristicType()) << name;
   }
 
-  ScopedVector<AutofillField> list_;
+  std::vector<std::unique_ptr<AutofillField>> list_;
   std::unique_ptr<PhoneField> field_;
   FieldCandidatesMap field_candidates_map_;
 
@@ -65,14 +65,14 @@ class PhoneFieldTest : public testing::Test {
 };
 
 TEST_F(PhoneFieldTest, Empty) {
-  AutofillScanner scanner(list_.get());
+  AutofillScanner scanner(list_);
   field_ = Parse(&scanner);
   ASSERT_EQ(nullptr, field_.get());
 }
 
 TEST_F(PhoneFieldTest, NonParse) {
-  list_.push_back(new AutofillField);
-  AutofillScanner scanner(list_.get());
+  list_.push_back(base::MakeUnique<AutofillField>());
+  AutofillScanner scanner(list_);
   field_ = Parse(&scanner);
   ASSERT_EQ(nullptr, field_.get());
 }
@@ -86,9 +86,10 @@ TEST_F(PhoneFieldTest, ParseOneLinePhone) {
     field.form_control_type = field_type;
     field.label = ASCIIToUTF16("Phone");
     field.name = ASCIIToUTF16("phone");
-    list_.push_back(new AutofillField(field, ASCIIToUTF16("phone1")));
+    list_.push_back(
+        base::MakeUnique<AutofillField>(field, ASCIIToUTF16("phone1")));
 
-    AutofillScanner scanner(list_.get());
+    AutofillScanner scanner(list_);
     field_ = Parse(&scanner);
     ASSERT_NE(nullptr, field_.get());
     field_->AddClassifications(&field_candidates_map_);
@@ -105,13 +106,15 @@ TEST_F(PhoneFieldTest, ParseTwoLinePhone) {
     field.form_control_type = field_type;
     field.label = ASCIIToUTF16("Area Code");
     field.name = ASCIIToUTF16("area code");
-    list_.push_back(new AutofillField(field, ASCIIToUTF16("areacode1")));
+    list_.push_back(
+        base::MakeUnique<AutofillField>(field, ASCIIToUTF16("areacode1")));
 
     field.label = ASCIIToUTF16("Phone");
     field.name = ASCIIToUTF16("phone");
-    list_.push_back(new AutofillField(field, ASCIIToUTF16("phone2")));
+    list_.push_back(
+        base::MakeUnique<AutofillField>(field, ASCIIToUTF16("phone2")));
 
-    AutofillScanner scanner(list_.get());
+    AutofillScanner scanner(list_);
     field_ = Parse(&scanner);
     ASSERT_NE(nullptr, field_.get());
     field_->AddClassifications(&field_candidates_map_);
@@ -135,24 +138,28 @@ TEST_F(PhoneFieldTest, ThreePartPhoneNumber) {
     field.label = ASCIIToUTF16("Phone:");
     field.name = ASCIIToUTF16("dayphone1");
     field.max_length = 0;
-    list_.push_back(new AutofillField(field, ASCIIToUTF16("areacode1")));
+    list_.push_back(
+        base::MakeUnique<AutofillField>(field, ASCIIToUTF16("areacode1")));
 
     field.label = ASCIIToUTF16("-");
     field.name = ASCIIToUTF16("dayphone2");
     field.max_length = 3;
-    list_.push_back(new AutofillField(field, ASCIIToUTF16("prefix2")));
+    list_.push_back(
+        base::MakeUnique<AutofillField>(field, ASCIIToUTF16("prefix2")));
 
     field.label = ASCIIToUTF16("-");
     field.name = ASCIIToUTF16("dayphone3");
     field.max_length = 4;
-    list_.push_back(new AutofillField(field, ASCIIToUTF16("suffix3")));
+    list_.push_back(
+        base::MakeUnique<AutofillField>(field, ASCIIToUTF16("suffix3")));
 
     field.label = ASCIIToUTF16("ext.:");
     field.name = ASCIIToUTF16("dayphone4");
     field.max_length = 0;
-    list_.push_back(new AutofillField(field, ASCIIToUTF16("ext4")));
+    list_.push_back(
+        base::MakeUnique<AutofillField>(field, ASCIIToUTF16("ext4")));
 
-    AutofillScanner scanner(list_.get());
+    AutofillScanner scanner(list_);
     field_ = Parse(&scanner);
     ASSERT_NE(nullptr, field_.get());
     field_->AddClassifications(&field_candidates_map_);
@@ -175,17 +182,20 @@ TEST_F(PhoneFieldTest, ThreePartPhoneNumberPrefixSuffix) {
     field.form_control_type = field_type;
     field.label = ASCIIToUTF16("Phone:");
     field.name = ASCIIToUTF16("area");
-    list_.push_back(new AutofillField(field, ASCIIToUTF16("areacode1")));
+    list_.push_back(
+        base::MakeUnique<AutofillField>(field, ASCIIToUTF16("areacode1")));
 
     field.label = base::string16();
     field.name = ASCIIToUTF16("prefix");
-    list_.push_back(new AutofillField(field, ASCIIToUTF16("prefix2")));
+    list_.push_back(
+        base::MakeUnique<AutofillField>(field, ASCIIToUTF16("prefix2")));
 
     field.label = base::string16();
     field.name = ASCIIToUTF16("suffix");
-    list_.push_back(new AutofillField(field, ASCIIToUTF16("suffix3")));
+    list_.push_back(
+        base::MakeUnique<AutofillField>(field, ASCIIToUTF16("suffix3")));
 
-    AutofillScanner scanner(list_.get());
+    AutofillScanner scanner(list_);
     field_ = Parse(&scanner);
     ASSERT_NE(nullptr, field_.get());
     field_->AddClassifications(&field_candidates_map_);
@@ -205,19 +215,22 @@ TEST_F(PhoneFieldTest, ThreePartPhoneNumberPrefixSuffix2) {
     field.label = ASCIIToUTF16("(");
     field.name = ASCIIToUTF16("phone1");
     field.max_length = 3;
-    list_.push_back(new AutofillField(field, ASCIIToUTF16("phone1")));
+    list_.push_back(
+        base::MakeUnique<AutofillField>(field, ASCIIToUTF16("phone1")));
 
     field.label = ASCIIToUTF16(")");
     field.name = ASCIIToUTF16("phone2");
     field.max_length = 3;
-    list_.push_back(new AutofillField(field, ASCIIToUTF16("phone2")));
+    list_.push_back(
+        base::MakeUnique<AutofillField>(field, ASCIIToUTF16("phone2")));
 
     field.label = base::string16();
     field.name = ASCIIToUTF16("phone3");
     field.max_length = 4;
-    list_.push_back(new AutofillField(field, ASCIIToUTF16("phone3")));
+    list_.push_back(
+        base::MakeUnique<AutofillField>(field, ASCIIToUTF16("phone3")));
 
-    AutofillScanner scanner(list_.get());
+    AutofillScanner scanner(list_);
     field_ = Parse(&scanner);
     ASSERT_NE(nullptr, field_.get());
     field_->AddClassifications(&field_candidates_map_);
@@ -239,14 +252,16 @@ TEST_F(PhoneFieldTest, CountryAndCityAndPhoneNumber) {
     field.label = ASCIIToUTF16("Phone Number");
     field.name = ASCIIToUTF16("CountryCode");
     field.max_length = 3;
-    list_.push_back(new AutofillField(field, ASCIIToUTF16("country")));
+    list_.push_back(
+        base::MakeUnique<AutofillField>(field, ASCIIToUTF16("country")));
 
     field.label = ASCIIToUTF16("Phone Number");
     field.name = ASCIIToUTF16("PhoneNumber");
     field.max_length = 10;
-    list_.push_back(new AutofillField(field, ASCIIToUTF16("phone")));
+    list_.push_back(
+        base::MakeUnique<AutofillField>(field, ASCIIToUTF16("phone")));
 
-    AutofillScanner scanner(list_.get());
+    AutofillScanner scanner(list_);
     field_ = Parse(&scanner);
     ASSERT_NE(nullptr, field_.get());
     field_->AddClassifications(&field_candidates_map_);