diff options
Diffstat (limited to 'chrome/browser/webdata/web_database_unittest.cc')
| -rw-r--r-- | chrome/browser/webdata/web_database_unittest.cc | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/chrome/browser/webdata/web_database_unittest.cc b/chrome/browser/webdata/web_database_unittest.cc index 2e043f4..0a6d6c5 100644 --- a/chrome/browser/webdata/web_database_unittest.cc +++ b/chrome/browser/webdata/web_database_unittest.cc @@ -392,27 +392,19 @@ TEST_F(WebDatabaseTest, Autofill) { // Simulate the submission of a handful of entries in a field called "Name", // some more often than others. EXPECT_TRUE(db.AddFormFieldValue( - FormField(NULL, - ASCIIToUTF16("Name"), - ASCIIToUTF16("Superman")))); + FormField(ASCIIToUTF16("Name"), ASCIIToUTF16("Superman")))); std::vector<string16> v; for (int i = 0; i < 5; i++) { EXPECT_TRUE(db.AddFormFieldValue( - FormField(NULL, - ASCIIToUTF16("Name"), - ASCIIToUTF16("Clark Kent")))); + FormField(ASCIIToUTF16("Name"), ASCIIToUTF16("Clark Kent")))); } for (int i = 0; i < 3; i++) { EXPECT_TRUE(db.AddFormFieldValue( - FormField(NULL, - ASCIIToUTF16("Name"), - ASCIIToUTF16("Clark Sutter")))); + FormField(ASCIIToUTF16("Name"), ASCIIToUTF16("Clark Sutter")))); } for (int i = 0; i < 2; i++) { EXPECT_TRUE(db.AddFormFieldValue( - FormField(NULL, - ASCIIToUTF16("Favorite Color"), - ASCIIToUTF16("Green")))); + FormField(ASCIIToUTF16("Favorite Color"), ASCIIToUTF16("Green")))); } int count = 0; @@ -421,7 +413,7 @@ TEST_F(WebDatabaseTest, Autofill) { // We have added the name Clark Kent 5 times, so count should be 5 and pair_id // should be somthing non-zero. EXPECT_TRUE(db.GetIDAndCountOfFormElement( - FormField(NULL, ASCIIToUTF16("Name"), ASCIIToUTF16("Clark Kent")), + FormField(ASCIIToUTF16("Name"), ASCIIToUTF16("Clark Kent")), &pair_id, &count)); EXPECT_EQ(5, count); EXPECT_NE(0, pair_id); @@ -429,12 +421,12 @@ TEST_F(WebDatabaseTest, Autofill) { // Storing in the data base should be case sensitive, so there should be no // database entry for clark kent lowercase. EXPECT_TRUE(db.GetIDAndCountOfFormElement( - FormField(NULL, ASCIIToUTF16("Name"), ASCIIToUTF16("clark kent")), + FormField(ASCIIToUTF16("Name"), ASCIIToUTF16("clark kent")), &pair_id, &count)); EXPECT_EQ(0, count); EXPECT_TRUE(db.GetIDAndCountOfFormElement( - FormField(NULL, ASCIIToUTF16("Favorite Color"), ASCIIToUTF16("Green")), + FormField(ASCIIToUTF16("Favorite Color"), ASCIIToUTF16("Green")), &pair_id, &count)); EXPECT_EQ(2, count); @@ -475,7 +467,7 @@ TEST_F(WebDatabaseTest, Autofill) { EXPECT_TRUE(db.RemoveFormElementsAddedBetween(t1, Time())); EXPECT_TRUE(db.GetIDAndCountOfFormElement( - FormField(NULL, ASCIIToUTF16("Name"), ASCIIToUTF16("Clark Kent")), + FormField(ASCIIToUTF16("Name"), ASCIIToUTF16("Clark Kent")), &pair_id, &count)); EXPECT_EQ(0, count); @@ -485,17 +477,13 @@ TEST_F(WebDatabaseTest, Autofill) { // Now add some values with empty strings. const string16 kValue = ASCIIToUTF16(" toto "); - EXPECT_TRUE(db.AddFormFieldValue(FormField(NULL, - ASCIIToUTF16("blank"), + EXPECT_TRUE(db.AddFormFieldValue(FormField(ASCIIToUTF16("blank"), string16()))); - EXPECT_TRUE(db.AddFormFieldValue(FormField(NULL, - ASCIIToUTF16("blank"), + EXPECT_TRUE(db.AddFormFieldValue(FormField(ASCIIToUTF16("blank"), ASCIIToUTF16(" ")))); - EXPECT_TRUE(db.AddFormFieldValue(FormField(NULL, - ASCIIToUTF16("blank"), + EXPECT_TRUE(db.AddFormFieldValue(FormField(ASCIIToUTF16("blank"), ASCIIToUTF16(" ")))); - EXPECT_TRUE(db.AddFormFieldValue(FormField(NULL, - ASCIIToUTF16("blank"), + EXPECT_TRUE(db.AddFormFieldValue(FormField(ASCIIToUTF16("blank"), kValue))); // They should be stored normally as the DB layer does not check for empty |