Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(157)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/autofill/core/browser/name_field_unittest.cc

Issue 2609703002: Remove ScopedVector from autofill. (Closed)
Patch Set: drop the using Created 3 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/autofill/core/browser/form_structure.cc ('k') | components/autofill/core/browser/personal_data_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/autofill/core/browser/name_field_unittest.cc
diff --git a/components/autofill/core/browser/name_field_unittest.cc b/components/autofill/core/browser/name_field_unittest.cc
index a76c15f62b6f8421329d2868a678817df0e8b42a..584becf107c7c32e95e7e5ed61a492268192773d 100644
--- a/components/autofill/core/browser/name_field_unittest.cc
+++ b/components/autofill/core/browser/name_field_unittest.cc
@@ -5,10 +5,10 @@
#include "components/autofill/core/browser/name_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"
@@ -24,7 +24,7 @@ class NameFieldTest : public testing::Test {
NameFieldTest() {}
protected:
- ScopedVector<AutofillField> list_;
+ std::vector<std::unique_ptr<AutofillField>> list_;
std::unique_ptr<NameField> field_;
FieldCandidatesMap field_candidates_map_;
@@ -44,17 +44,20 @@ TEST_F(NameFieldTest, FirstMiddleLast) {
field.label = ASCIIToUTF16("First Name");
field.name = ASCIIToUTF16("First");
- list_.push_back(new AutofillField(field, ASCIIToUTF16("name1")));
+ list_.push_back(
+ base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name1")));
field.label = ASCIIToUTF16("Middle Name");
field.name = ASCIIToUTF16("Middle");
- list_.push_back(new AutofillField(field, ASCIIToUTF16("name2")));
+ list_.push_back(
+ base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name2")));
field.label = ASCIIToUTF16("Last Name");
field.name = ASCIIToUTF16("Last");
- list_.push_back(new AutofillField(field, ASCIIToUTF16("name3")));
+ list_.push_back(
+ base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name3")));
- AutofillScanner scanner(list_.get());
+ AutofillScanner scanner(list_);
field_ = Parse(&scanner);
ASSERT_NE(nullptr, field_.get());
field_->AddClassifications(&field_candidates_map_);
@@ -78,17 +81,20 @@ TEST_F(NameFieldTest, FirstMiddleLast2) {
field.label = base::string16();
field.name = ASCIIToUTF16("firstName");
- list_.push_back(new AutofillField(field, ASCIIToUTF16("name1")));
+ list_.push_back(
+ base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name1")));
field.label = base::string16();
field.name = ASCIIToUTF16("middleName");
- list_.push_back(new AutofillField(field, ASCIIToUTF16("name2")));
+ list_.push_back(
+ base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name2")));
field.label = base::string16();
field.name = ASCIIToUTF16("lastName");
- list_.push_back(new AutofillField(field, ASCIIToUTF16("name3")));
+ list_.push_back(
+ base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name3")));
- AutofillScanner scanner(list_.get());
+ AutofillScanner scanner(list_);
field_ = Parse(&scanner);
ASSERT_NE(nullptr, field_.get());
field_->AddClassifications(&field_candidates_map_);
@@ -112,13 +118,15 @@ TEST_F(NameFieldTest, FirstLast) {
field.label = base::string16();
field.name = ASCIIToUTF16("first_name");
- list_.push_back(new AutofillField(field, ASCIIToUTF16("name1")));
+ list_.push_back(
+ base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name1")));
field.label = base::string16();
field.name = ASCIIToUTF16("last_name");
- list_.push_back(new AutofillField(field, ASCIIToUTF16("name2")));
+ list_.push_back(
+ base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name2")));
- AutofillScanner scanner(list_.get());
+ AutofillScanner scanner(list_);
field_ = Parse(&scanner);
ASSERT_NE(nullptr, field_.get());
field_->AddClassifications(&field_candidates_map_);
@@ -138,13 +146,15 @@ TEST_F(NameFieldTest, FirstLast2) {
field.label = ASCIIToUTF16("Name");
field.name = ASCIIToUTF16("first_name");
- list_.push_back(new AutofillField(field, ASCIIToUTF16("name1")));
+ list_.push_back(
+ base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name1")));
field.label = ASCIIToUTF16("Name");
field.name = ASCIIToUTF16("last_name");
- list_.push_back(new AutofillField(field, ASCIIToUTF16("name2")));
+ list_.push_back(
+ base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name2")));
- AutofillScanner scanner(list_.get());
+ AutofillScanner scanner(list_);
field_ = Parse(&scanner);
ASSERT_NE(nullptr, field_.get());
field_->AddClassifications(&field_candidates_map_);
@@ -164,17 +174,20 @@ TEST_F(NameFieldTest, FirstLastMiddleWithSpaces) {
field.label = ASCIIToUTF16("First Name");
field.name = ASCIIToUTF16("first_name");
- list_.push_back(new AutofillField(field, ASCIIToUTF16("name1")));
+ list_.push_back(
+ base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name1")));
field.label = ASCIIToUTF16("Middle Name");
field.name = ASCIIToUTF16("middle_name");
- list_.push_back(new AutofillField(field, ASCIIToUTF16("name2")));
+ list_.push_back(
+ base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name2")));
field.label = ASCIIToUTF16("Last Name");
field.name = ASCIIToUTF16("last_name");
- list_.push_back(new AutofillField(field, ASCIIToUTF16("name3")));
+ list_.push_back(
+ base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name3")));
- AutofillScanner scanner(list_.get());
+ AutofillScanner scanner(list_);
field_ = Parse(&scanner);
ASSERT_NE(nullptr, field_.get());
field_->AddClassifications(&field_candidates_map_);
@@ -198,13 +211,15 @@ TEST_F(NameFieldTest, FirstLastEmpty) {
field.label = ASCIIToUTF16("Name");
field.name = ASCIIToUTF16("first_name");
- list_.push_back(new AutofillField(field, ASCIIToUTF16("name1")));
+ list_.push_back(
+ base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name1")));
- field.label = base::string16();
+ field.label = base::string16();
field.name = ASCIIToUTF16("last_name");
- list_.push_back(new AutofillField(field, ASCIIToUTF16("name2")));
+ list_.push_back(
+ base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name2")));
- AutofillScanner scanner(list_.get());
+ AutofillScanner scanner(list_);
field_ = Parse(&scanner);
ASSERT_NE(nullptr, field_.get());
field_->AddClassifications(&field_candidates_map_);
@@ -224,17 +239,20 @@ TEST_F(NameFieldTest, FirstMiddleLastEmpty) {
field.label = ASCIIToUTF16("Name");
field.name = ASCIIToUTF16("first_name");
- list_.push_back(new AutofillField(field, ASCIIToUTF16("name1")));
+ list_.push_back(
+ base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name1")));
field.label = base::string16();
field.name = ASCIIToUTF16("middle_name");
- list_.push_back(new AutofillField(field, ASCIIToUTF16("name2")));
+ list_.push_back(
+ base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name2")));
field.label = base::string16();
field.name = ASCIIToUTF16("last_name");
- list_.push_back(new AutofillField(field, ASCIIToUTF16("name3")));
+ list_.push_back(
+ base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name3")));
- AutofillScanner scanner(list_.get());
+ AutofillScanner scanner(list_);
field_ = Parse(&scanner);
ASSERT_NE(nullptr, field_.get());
field_->AddClassifications(&field_candidates_map_);
@@ -258,17 +276,20 @@ TEST_F(NameFieldTest, MiddleInitial) {
field.label = ASCIIToUTF16("First Name");
field.name = ASCIIToUTF16("first_name");
- list_.push_back(new AutofillField(field, ASCIIToUTF16("name1")));
+ list_.push_back(
+ base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name1")));
field.label = ASCIIToUTF16("MI");
field.name = ASCIIToUTF16("middle_name");
- list_.push_back(new AutofillField(field, ASCIIToUTF16("name2")));
+ list_.push_back(
+ base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name2")));
field.label = ASCIIToUTF16("Last Name");
field.name = ASCIIToUTF16("last_name");
- list_.push_back(new AutofillField(field, ASCIIToUTF16("name3")));
+ list_.push_back(
+ base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name3")));
- AutofillScanner scanner(list_.get());
+ AutofillScanner scanner(list_);
field_ = Parse(&scanner);
ASSERT_NE(nullptr, field_.get());
field_->AddClassifications(&field_candidates_map_);
@@ -292,13 +313,15 @@ TEST_F(NameFieldTest, MiddleInitialNoLastName) {
field.label = ASCIIToUTF16("First Name");
field.name = ASCIIToUTF16("first_name");
- list_.push_back(new AutofillField(field, ASCIIToUTF16("name1")));
+ list_.push_back(
+ base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name1")));
field.label = ASCIIToUTF16("MI");
field.name = ASCIIToUTF16("middle_name");
- list_.push_back(new AutofillField(field, ASCIIToUTF16("name2")));
+ list_.push_back(
+ base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name2")));
- AutofillScanner scanner(list_.get());
+ AutofillScanner scanner(list_);
field_ = Parse(&scanner);
ASSERT_EQ(nullptr, field_.get());
}
@@ -311,17 +334,20 @@ TEST_F(NameFieldTest, MiddleInitialAtEnd) {
field.label = base::string16();
field.name = ASCIIToUTF16("XXXnameXXXfirst");
- list_.push_back(new AutofillField(field, ASCIIToUTF16("name1")));
+ list_.push_back(
+ base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name1")));
field.label = base::string16();
field.name = ASCIIToUTF16("XXXnameXXXmi");
- list_.push_back(new AutofillField(field, ASCIIToUTF16("name2")));
+ list_.push_back(
+ base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name2")));
field.label = base::string16();
field.name = ASCIIToUTF16("XXXnameXXXlast");
- list_.push_back(new AutofillField(field, ASCIIToUTF16("name3")));
+ list_.push_back(
+ base::MakeUnique<AutofillField>(field, ASCIIToUTF16("name3")));
- AutofillScanner scanner(list_.get());
+ AutofillScanner scanner(list_);
field_ = Parse(&scanner);
ASSERT_NE(nullptr, field_.get());
field_->AddClassifications(&field_candidates_map_);
« no previous file with comments | « components/autofill/core/browser/form_structure.cc ('k') | components/autofill/core/browser/personal_data_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698