Remove ScopedVector from autofill.

components/autofill/core/browser/credit_card_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 "components/autofill/core/browser/credit_card_field.h"
 
 #include <memory>
+#include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
-#include "base/memory/scoped_vector.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_field.h"
 #include "components/autofill/core/browser/autofill_scanner.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::ASCIIToUTF16;
 
 namespace autofill {
 
 class CreditCardFieldTest : public testing::Test {
  public:
   CreditCardFieldTest() {}
   ~CreditCardFieldTest() override {}
 
  protected:
-  ScopedVector<AutofillField> list_;
+  std::vector<std::unique_ptr<AutofillField>> list_;
   std::unique_ptr<const CreditCardField> field_;
   FieldCandidatesMap field_candidates_map_;
 
   // Parses the contents of |list_| as a form, and stores the result into
   // |field_|.
   void Parse() {
-    AutofillScanner scanner(list_.get());
+    AutofillScanner scanner(list_);
     std::unique_ptr<FormField> field = CreditCardField::Parse(&scanner);
     field_ = base::WrapUnique(static_cast<CreditCardField*>(field.release()));
   }
 
   void MultipleParses() {
     std::unique_ptr<FormField> field;
 
-    AutofillScanner scanner(list_.get());
+    AutofillScanner scanner(list_);
     while (!scanner.IsEnd()) {
       field = CreditCardField::Parse(&scanner);
       field_ = base::WrapUnique(static_cast<CreditCardField*>(field.release()));
       if (field_ == nullptr) {
         scanner.Advance();
       } else {
         AddClassifications();
       }
     }
   }
 
   // Associates fields with their corresponding types, based on the previous
   // call to Parse().
   void AddClassifications() {
     return field_->AddClassifications(&field_candidates_map_);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CreditCardFieldTest);
 };
 
 TEST_F(CreditCardFieldTest, Empty) {
   Parse();
   ASSERT_EQ(nullptr, field_.get());
 }
 
 TEST_F(CreditCardFieldTest, NonParse) {
-  list_.push_back(new AutofillField);
+  list_.push_back(base::MakeUnique<AutofillField>());
   Parse();
   ASSERT_EQ(nullptr, field_.get());
 }
 
 TEST_F(CreditCardFieldTest, ParseCreditCardNoNumber) {
   FormFieldData field;
   field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("Exp Month");
   field.name = ASCIIToUTF16("ccmonth");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("month1")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("month1")));
 
   field.label = ASCIIToUTF16("Exp Year");
   field.name = ASCIIToUTF16("ccyear");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("year2")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("year2")));
 
   Parse();
   ASSERT_EQ(nullptr, field_.get());
 }
 
 TEST_F(CreditCardFieldTest, ParseCreditCardNoDate) {
   FormFieldData field;
   field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("Card Number");
   field.name = ASCIIToUTF16("card_number");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("number1")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("number1")));
 
   Parse();
   ASSERT_EQ(nullptr, field_.get());
 }
 
 TEST_F(CreditCardFieldTest, ParseMiniumCreditCard) {
   FormFieldData field;
   field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("Card Number");
   field.name = ASCIIToUTF16("card_number");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("number1")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("number1")));
 
   field.label = ASCIIToUTF16("Exp Month");
   field.name = ASCIIToUTF16("ccmonth");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("month2")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("month2")));
 
   field.label = ASCIIToUTF16("Exp Year");
   field.name = ASCIIToUTF16("ccyear");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("year3")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("year3")));
 
   Parse();
   ASSERT_NE(nullptr, field_.get());
   AddClassifications();
   ASSERT_TRUE(field_candidates_map_.find(ASCIIToUTF16("number1")) !=
               field_candidates_map_.end());
   EXPECT_EQ(CREDIT_CARD_NUMBER,
             field_candidates_map_[ASCIIToUTF16("number1")].BestHeuristicType());
   ASSERT_TRUE(field_candidates_map_.find(ASCIIToUTF16("month2")) !=
               field_candidates_map_.end());
   EXPECT_EQ(CREDIT_CARD_EXP_MONTH,
             field_candidates_map_[ASCIIToUTF16("month2")].BestHeuristicType());
   ASSERT_TRUE(field_candidates_map_.find(ASCIIToUTF16("year3")) !=
               field_candidates_map_.end());
   EXPECT_EQ(CREDIT_CARD_EXP_4_DIGIT_YEAR,
             field_candidates_map_[ASCIIToUTF16("year3")].BestHeuristicType());
 }
 
 TEST_F(CreditCardFieldTest, ParseFullCreditCard) {
   FormFieldData field;
   field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("Name on Card");
   field.name = ASCIIToUTF16("name_on_card");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("name")));
+  list_.push_back(base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name")));
 
   field.label = ASCIIToUTF16("Card Number");
   field.name = ASCIIToUTF16("card_number");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("number")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("number")));
 
   field.label = ASCIIToUTF16("Exp Month");
   field.name = ASCIIToUTF16("ccmonth");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("month")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("month")));
 
   field.label = ASCIIToUTF16("Exp Year");
   field.name = ASCIIToUTF16("ccyear");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("year")));
+  list_.push_back(base::MakeUnique<AutofillField>(field, ASCIIToUTF16("year")));
 
   field.label = ASCIIToUTF16("Verification");
   field.name = ASCIIToUTF16("verification");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("cvc")));
+  list_.push_back(base::MakeUnique<AutofillField>(field, ASCIIToUTF16("cvc")));
 
   field.form_control_type = "select-one";
   field.label = ASCIIToUTF16("Card Type");
   field.name = ASCIIToUTF16("card_type");
   field.option_contents.push_back(ASCIIToUTF16("visa"));
   field.option_values.push_back(ASCIIToUTF16("visa"));
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("type")));
+  list_.push_back(base::MakeUnique<AutofillField>(field, ASCIIToUTF16("type")));
 
   Parse();
   ASSERT_NE(nullptr, field_.get());
   AddClassifications();
   ASSERT_TRUE(field_candidates_map_.find(ASCIIToUTF16("type")) !=
               field_candidates_map_.end());
   EXPECT_EQ(CREDIT_CARD_TYPE,
             field_candidates_map_[ASCIIToUTF16("type")].BestHeuristicType());
   ASSERT_TRUE(field_candidates_map_.find(ASCIIToUTF16("name")) !=
               field_candidates_map_.end());
@@ skipping 16 matching lines @@
   EXPECT_EQ(CREDIT_CARD_VERIFICATION_CODE,
             field_candidates_map_[ASCIIToUTF16("cvc")].BestHeuristicType());
 }
 
 TEST_F(CreditCardFieldTest, ParseExpMonthYear) {
   FormFieldData field;
   field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("Name on Card");
   field.name = ASCIIToUTF16("name_on_card");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("name1")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name1")));
 
   field.label = ASCIIToUTF16("Card Number");
   field.name = ASCIIToUTF16("card_number");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("number2")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("number2")));
 
   field.label = ASCIIToUTF16("ExpDate Month / Year");
   field.name = ASCIIToUTF16("ExpDate");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("month3")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("month3")));
 
   field.label = ASCIIToUTF16("ExpDate Month / Year");
   field.name = ASCIIToUTF16("ExpDate");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("year4")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("year4")));
 
   Parse();
   ASSERT_NE(nullptr, field_.get());
   AddClassifications();
   ASSERT_TRUE(field_candidates_map_.find(ASCIIToUTF16("name1")) !=
               field_candidates_map_.end());
   EXPECT_EQ(CREDIT_CARD_NAME_FULL,
             field_candidates_map_[ASCIIToUTF16("name1")].BestHeuristicType());
   ASSERT_TRUE(field_candidates_map_.find(ASCIIToUTF16("number2")) !=
               field_candidates_map_.end());
   EXPECT_EQ(CREDIT_CARD_NUMBER,
             field_candidates_map_[ASCIIToUTF16("number2")].BestHeuristicType());
   ASSERT_TRUE(field_candidates_map_.find(ASCIIToUTF16("month3")) !=
               field_candidates_map_.end());
   EXPECT_EQ(CREDIT_CARD_EXP_MONTH,
             field_candidates_map_[ASCIIToUTF16("month3")].BestHeuristicType());
   ASSERT_TRUE(field_candidates_map_.find(ASCIIToUTF16("year4")) !=
               field_candidates_map_.end());
   EXPECT_EQ(CREDIT_CARD_EXP_4_DIGIT_YEAR,
             field_candidates_map_[ASCIIToUTF16("year4")].BestHeuristicType());
 }
 
 TEST_F(CreditCardFieldTest, ParseExpMonthYear2) {
   FormFieldData field;
   field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("Name on Card");
   field.name = ASCIIToUTF16("name_on_card");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("name1")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name1")));
 
   field.label = ASCIIToUTF16("Card Number");
   field.name = ASCIIToUTF16("card_number");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("number2")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("number2")));
 
   field.label = ASCIIToUTF16("Expiration date Month / Year");
   field.name = ASCIIToUTF16("ExpDate");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("month3")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("month3")));
 
   field.label = ASCIIToUTF16("Expiration date Month / Year");
   field.name = ASCIIToUTF16("ExpDate");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("year4")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("year4")));
 
   Parse();
   ASSERT_NE(nullptr, field_.get());
   AddClassifications();
   ASSERT_TRUE(field_candidates_map_.find(ASCIIToUTF16("name1")) !=
               field_candidates_map_.end());
   EXPECT_EQ(CREDIT_CARD_NAME_FULL,
             field_candidates_map_[ASCIIToUTF16("name1")].BestHeuristicType());
   ASSERT_TRUE(field_candidates_map_.find(ASCIIToUTF16("number2")) !=
               field_candidates_map_.end());
@@ skipping 69 matching lines @@
     // Clean up after previous test cases.
     list_.clear();
     field_.reset();
     field_candidates_map_.clear();
 
     FormFieldData field;
     field.form_control_type = "text";
 
     field.label = ASCIIToUTF16("Name on Card");
     field.name = ASCIIToUTF16("name_on_card");
-    list_.push_back(new AutofillField(field, ASCIIToUTF16("name1")));
+    list_.push_back(
+        base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name1")));
 
     field.label = ASCIIToUTF16("Card Number");
     field.name = ASCIIToUTF16("card_number");
-    list_.push_back(new AutofillField(field, ASCIIToUTF16("num2")));
+    list_.push_back(
+        base::MakeUnique<AutofillField>(field, ASCIIToUTF16("num2")));
 
     field.label = ASCIIToUTF16(test_case.label);
     if (test_case.max_length != 0) {
       field.max_length = test_case.max_length;
     }
     field.name = ASCIIToUTF16("cc_exp");
-    list_.push_back(new AutofillField(field, ASCIIToUTF16("exp3")));
+    list_.push_back(
+        base::MakeUnique<AutofillField>(field, ASCIIToUTF16("exp3")));
 
     Parse();
 
     // Assists in identifing which case has failed.
     SCOPED_TRACE(test_case.expected_prediction);
     SCOPED_TRACE(test_case.max_length);
     SCOPED_TRACE(test_case.label);
 
     if (test_case.expected_prediction == UNKNOWN_TYPE) {
       // Expect failure and continue to next test case.
@@ skipping 22 matching lines @@
               field_candidates_map_[ASCIIToUTF16("exp3")].BestHeuristicType());
   }
 }
 
 TEST_F(CreditCardFieldTest, ParseCreditCardHolderNameWithCCFullName) {
   FormFieldData field;
   field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("Name");
   field.name = ASCIIToUTF16("ccfullname");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("name1")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name1")));
 
   Parse();
   ASSERT_NE(nullptr, field_.get());
   AddClassifications();
   ASSERT_TRUE(field_candidates_map_.find(ASCIIToUTF16("name1")) !=
               field_candidates_map_.end());
   EXPECT_EQ(CREDIT_CARD_NAME_FULL,
             field_candidates_map_[ASCIIToUTF16("name1")].BestHeuristicType());
 }
 
 // Verifies that <input type="month"> controls are able to be parsed correctly.
 TEST_F(CreditCardFieldTest, ParseMonthControl) {
   FormFieldData field;
 
   field.form_control_type = "text";
   field.label = ASCIIToUTF16("Card number:");
   field.name = ASCIIToUTF16("ccnumber");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("number1")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("number1")));
 
   field.form_control_type = "month";
   field.label = ASCIIToUTF16("Expiration date:");
   field.name = ASCIIToUTF16("ccexp");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("date2")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("date2")));
 
   Parse();
   ASSERT_NE(nullptr, field_.get());
   AddClassifications();
   ASSERT_TRUE(field_candidates_map_.find(ASCIIToUTF16("number1")) !=
               field_candidates_map_.end());
   EXPECT_EQ(CREDIT_CARD_NUMBER,
             field_candidates_map_[ASCIIToUTF16("number1")].BestHeuristicType());
   ASSERT_TRUE(field_candidates_map_.find(ASCIIToUTF16("date2")) !=
               field_candidates_map_.end());
   EXPECT_EQ(CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR,
             field_candidates_map_[ASCIIToUTF16("date2")].BestHeuristicType());
 }
 
 // Verify that heuristics <input name="ccyear" maxlength="2"/> considers
 // *maxlength* attribute while parsing 2 Digit expiration year.
 TEST_F(CreditCardFieldTest, ParseCreditCardExpYear_2DigitMaxLength) {
   FormFieldData field;
   field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("Card Number");
   field.name = ASCIIToUTF16("card_number");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("number")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("number")));
 
   field.label = ASCIIToUTF16("Expiration Date");
   field.name = ASCIIToUTF16("ccmonth");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("month")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("month")));
 
   field.name = ASCIIToUTF16("ccyear");
   field.max_length = 2;
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("year")));
+  list_.push_back(base::MakeUnique<AutofillField>(field, ASCIIToUTF16("year")));
 
   Parse();
   ASSERT_NE(nullptr, field_.get());
   AddClassifications();
   ASSERT_TRUE(field_candidates_map_.find(ASCIIToUTF16("number")) !=
               field_candidates_map_.end());
   EXPECT_EQ(CREDIT_CARD_NUMBER,
             field_candidates_map_[ASCIIToUTF16("number")].BestHeuristicType());
   ASSERT_TRUE(field_candidates_map_.find(ASCIIToUTF16("month")) !=
               field_candidates_map_.end());
   EXPECT_EQ(CREDIT_CARD_EXP_MONTH,
             field_candidates_map_[ASCIIToUTF16("month")].BestHeuristicType());
   ASSERT_TRUE(field_candidates_map_.find(ASCIIToUTF16("year")) !=
               field_candidates_map_.end());
   EXPECT_EQ(CREDIT_CARD_EXP_2_DIGIT_YEAR,
             field_candidates_map_[ASCIIToUTF16("year")].BestHeuristicType());
 }
 
 TEST_F(CreditCardFieldTest, ParseCreditCardNumberWithSplit) {
   FormFieldData field;
   field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("Card Number");
   field.name = ASCIIToUTF16("card_number_q1");
   field.max_length = 4;
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("number1")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("number1")));
 
   field.label = ASCIIToUTF16("Card Number");
   field.name = ASCIIToUTF16("card_number_q2");
   field.max_length = 4;
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("number2")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("number2")));
 
   field.label = ASCIIToUTF16("Card Number");
   field.name = ASCIIToUTF16("card_number_q3");
   field.max_length = 4;
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("number3")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("number3")));
 
   // For last credit card number input field it simply ignores the |max_length|
   // attribute. So even having a very big number, does not conside it an invalid
   // split for autofilling.
   field.label = ASCIIToUTF16("Card Number");
   field.name = ASCIIToUTF16("card_number_q4");
   field.max_length = 20;
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("number4")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("number4")));
 
   field.label = ASCIIToUTF16("Exp Month");
   field.name = ASCIIToUTF16("ccmonth");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("month5")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("month5")));
 
   field.label = ASCIIToUTF16("Exp Year");
   field.name = ASCIIToUTF16("ccyear");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("year6")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("year6")));
 
   Parse();
   ASSERT_NE(nullptr, field_.get());
   AddClassifications();
 
   ASSERT_TRUE(field_candidates_map_.find(ASCIIToUTF16("number1")) !=
               field_candidates_map_.end());
   EXPECT_EQ(CREDIT_CARD_NUMBER,
             field_candidates_map_[ASCIIToUTF16("number1")].BestHeuristicType());
   EXPECT_EQ(0U, list_[0]->credit_card_number_offset());
@@ skipping 25 matching lines @@
   EXPECT_EQ(CREDIT_CARD_EXP_4_DIGIT_YEAR,
             field_candidates_map_[ASCIIToUTF16("year6")].BestHeuristicType());
 }
 
 TEST_F(CreditCardFieldTest, ParseMultipleCreditCardNumbers) {
   FormFieldData field;
   field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("Name on Card");
   field.name = ASCIIToUTF16("name_on_card");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("name1")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name1")));
 
   field.label = ASCIIToUTF16("Card Number");
   field.name = ASCIIToUTF16("card_number");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("number2")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("number2")));
 
   field.label = ASCIIToUTF16("Confirm Card Number");
   field.name = ASCIIToUTF16("confirm_card_number");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("number3")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("number3")));
 
   field.label = ASCIIToUTF16("Exp Month");
   field.name = ASCIIToUTF16("ccmonth");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("month4")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("month4")));
 
   field.label = ASCIIToUTF16("Exp Year");
   field.name = ASCIIToUTF16("ccyear");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("year5")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("year5")));
 
   Parse();
   ASSERT_NE(nullptr, field_.get());
   AddClassifications();
 
   ASSERT_TRUE(field_candidates_map_.find(ASCIIToUTF16("name1")) !=
               field_candidates_map_.end());
   EXPECT_EQ(CREDIT_CARD_NAME_FULL,
             field_candidates_map_[ASCIIToUTF16("name1")].BestHeuristicType());
   ASSERT_TRUE(field_candidates_map_.find(ASCIIToUTF16("number2")) !=
@@ skipping 13 matching lines @@
   EXPECT_EQ(CREDIT_CARD_EXP_4_DIGIT_YEAR,
             field_candidates_map_[ASCIIToUTF16("year5")].BestHeuristicType());
 }
 
 TEST_F(CreditCardFieldTest, ParseFirstAndLastNames) {
   FormFieldData field;
   field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("First Name on Card");
   field.name = ASCIIToUTF16("cc-fname");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("name1")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name1")));
 
   field.label = ASCIIToUTF16("Last Name");
   field.name = ASCIIToUTF16("cc-lname");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("name2")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name2")));
 
   field.label = ASCIIToUTF16("Card Number");
   field.name = ASCIIToUTF16("card_number");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("number3")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("number3")));
 
   field.label = ASCIIToUTF16("Exp Month");
   field.name = ASCIIToUTF16("ccmonth");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("month4")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("month4")));
 
   field.label = ASCIIToUTF16("Exp Year");
   field.name = ASCIIToUTF16("ccyear");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("year5")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("year5")));
 
   Parse();
   ASSERT_NE(nullptr, field_.get());
   AddClassifications();
 
   ASSERT_TRUE(field_candidates_map_.find(ASCIIToUTF16("name1")) !=
               field_candidates_map_.end());
   EXPECT_EQ(CREDIT_CARD_NAME_FIRST,
             field_candidates_map_[ASCIIToUTF16("name1")].BestHeuristicType());
   ASSERT_TRUE(field_candidates_map_.find(ASCIIToUTF16("name2")) !=
@@ skipping 13 matching lines @@
   EXPECT_EQ(CREDIT_CARD_EXP_4_DIGIT_YEAR,
             field_candidates_map_[ASCIIToUTF16("year5")].BestHeuristicType());
 }
 
 TEST_F(CreditCardFieldTest, ParseConsecutiveCvc) {
   FormFieldData field;
   field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("Name on Card");
   field.name = ASCIIToUTF16("name_on_card");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("name")));
+  list_.push_back(base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name")));
 
   field.label = ASCIIToUTF16("Card Number");
   field.name = ASCIIToUTF16("card_number");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("number")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("number")));
 
   field.label = ASCIIToUTF16("Exp Month");
   field.name = ASCIIToUTF16("ccmonth");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("month")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("month")));
 
   field.label = ASCIIToUTF16("Exp Year");
   field.name = ASCIIToUTF16("ccyear");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("year")));
+  list_.push_back(base::MakeUnique<AutofillField>(field, ASCIIToUTF16("year")));
 
   field.label = ASCIIToUTF16("Verification");
   field.name = ASCIIToUTF16("verification");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("cvc")));
+  list_.push_back(base::MakeUnique<AutofillField>(field, ASCIIToUTF16("cvc")));
 
   field.label = ASCIIToUTF16("Verification");
   field.name = ASCIIToUTF16("verification");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("cvc2")));
+  list_.push_back(base::MakeUnique<AutofillField>(field, ASCIIToUTF16("cvc2")));
 
   MultipleParses();
 
   ASSERT_TRUE(field_candidates_map_.find(ASCIIToUTF16("name")) !=
               field_candidates_map_.end());
   EXPECT_EQ(CREDIT_CARD_NAME_FULL,
             field_candidates_map_[ASCIIToUTF16("name")].BestHeuristicType());
   ASSERT_TRUE(field_candidates_map_.find(ASCIIToUTF16("number")) !=
               field_candidates_map_.end());
   EXPECT_EQ(CREDIT_CARD_NUMBER,
@@ skipping 15 matching lines @@
   EXPECT_EQ(CREDIT_CARD_VERIFICATION_CODE,
             field_candidates_map_[ASCIIToUTF16("cvc2")].BestHeuristicType());
 }
 
 TEST_F(CreditCardFieldTest, ParseNonConsecutiveCvc) {
   FormFieldData field;
   field.form_control_type = "text";
 
   field.label = ASCIIToUTF16("Name on Card");
   field.name = ASCIIToUTF16("name_on_card");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("name")));
+  list_.push_back(base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name")));
 
   field.label = ASCIIToUTF16("Card Number");
   field.name = ASCIIToUTF16("card_number");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("number")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("number")));
 
   field.label = ASCIIToUTF16("Exp Month");
   field.name = ASCIIToUTF16("ccmonth");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("month")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("month")));
 
   field.label = ASCIIToUTF16("Exp Year");
   field.name = ASCIIToUTF16("ccyear");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("year")));
+  list_.push_back(base::MakeUnique<AutofillField>(field, ASCIIToUTF16("year")));
 
   field.label = ASCIIToUTF16("Verification");
   field.name = ASCIIToUTF16("verification");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("cvc")));
+  list_.push_back(base::MakeUnique<AutofillField>(field, ASCIIToUTF16("cvc")));
 
   field.label = ASCIIToUTF16("Unknown");
   field.name = ASCIIToUTF16("unknown");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("unknown")));
+  list_.push_back(
+      base::MakeUnique<AutofillField>(field, ASCIIToUTF16("unknown")));
 
   field.label = ASCIIToUTF16("Verification");
   field.name = ASCIIToUTF16("verification");
-  list_.push_back(new AutofillField(field, ASCIIToUTF16("cvc2")));
+  list_.push_back(base::MakeUnique<AutofillField>(field, ASCIIToUTF16("cvc2")));
 
   MultipleParses();
 
   ASSERT_TRUE(field_candidates_map_.find(ASCIIToUTF16("name")) !=
               field_candidates_map_.end());
   EXPECT_EQ(CREDIT_CARD_NAME_FULL,
             field_candidates_map_[ASCIIToUTF16("name")].BestHeuristicType());
   ASSERT_TRUE(field_candidates_map_.find(ASCIIToUTF16("number")) !=
               field_candidates_map_.end());
   EXPECT_EQ(CREDIT_CARD_NUMBER,
@@ skipping 10 matching lines @@
               field_candidates_map_.end());
   EXPECT_EQ(CREDIT_CARD_VERIFICATION_CODE,
             field_candidates_map_[ASCIIToUTF16("cvc")].BestHeuristicType());
   ASSERT_TRUE(field_candidates_map_.find(ASCIIToUTF16("unknown")) ==
               field_candidates_map_.end());
   ASSERT_TRUE(field_candidates_map_.find(ASCIIToUTF16("cvc2")) ==
               field_candidates_map_.end());
 }
 
 }  // namespace autofill