Differentiate between ADD and CHANGED when adding new autofill entries.

chrome/browser/webdata/web_database_unittest.cc

 // Copyright (c) 2009 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/file_util.h"
 #include "base/path_service.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/values.h"
@@ skipping 31 matching lines @@
     case AutofillChange::REMOVE: {
       os << "REMOVE";
       break;
     }
   }
   return os << " " << change.key();
 }
 
 class WebDatabaseTest : public testing::Test {
  protected:
-
+  typedef std::vector<AutofillChange> AutofillChangeList;
   virtual void SetUp() {
     PathService::Get(chrome::DIR_TEST_DATA, &file_);
     const std::string test_db = "TestWebDatabase" +
         Int64ToString(base::Time::Now().ToInternalValue()) +
         ".db";
     file_ = file_.AppendASCII(test_db);
     file_util::Delete(file_, false);
   }
 
   virtual void TearDown() {
@@ skipping 347 matching lines @@
 
 TEST_F(WebDatabaseTest, Autofill) {
   WebDatabase db;
 
   ASSERT_EQ(sql::INIT_OK, db.Init(file_));
 
   Time t1 = Time::Now();
 
   // Simulate the submission of a handful of entries in a field called "Name",
   // some more often than others.
+  AutofillChangeList changes;
   EXPECT_TRUE(db.AddFormFieldValue(
       FormField(string16(),
                 ASCIIToUTF16("Name"),
                 string16(),
-                ASCIIToUTF16("Superman"))));
+                ASCIIToUTF16("Superman")),
+      &changes));
   std::vector<string16> v;
   for (int i = 0; i < 5; i++) {
     EXPECT_TRUE(db.AddFormFieldValue(
         FormField(string16(),
                   ASCIIToUTF16("Name"),
                   string16(),
-                  ASCIIToUTF16("Clark Kent"))));
+                  ASCIIToUTF16("Clark Kent")),
+        &changes));
   }
   for (int i = 0; i < 3; i++) {
     EXPECT_TRUE(db.AddFormFieldValue(
         FormField(string16(),
                   ASCIIToUTF16("Name"),
                   string16(),
-                  ASCIIToUTF16("Clark Sutter"))));
+                  ASCIIToUTF16("Clark Sutter")),
+        &changes));
   }
   for (int i = 0; i < 2; i++) {
     EXPECT_TRUE(db.AddFormFieldValue(
         FormField(string16(),
                   ASCIIToUTF16("Favorite Color"),
                   string16(),
-                  ASCIIToUTF16("Green"))));
+                  ASCIIToUTF16("Green")),
+        &changes));
   }
 
   int count = 0;
   int64 pair_id = 0;
 
   // 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(string16(),
                 ASCIIToUTF16("Name"),
@@ skipping 48 matching lines @@
   EXPECT_TRUE(db.GetFormValuesForElementName(
       ASCIIToUTF16("Name"), ASCIIToUTF16("cLa"), &v, 6));
   EXPECT_EQ(2U, v.size());
   if (v.size() == 2) {
     EXPECT_EQ(ASCIIToUTF16("Clark Kent"), v[0]);
     EXPECT_EQ(ASCIIToUTF16("Clark Sutter"), v[1]);
   }
 
   // Removing all elements since the beginning of this function should remove
   // everything from the database.
-  std::vector<AutofillChange> changes;
+  changes.clear();
   EXPECT_TRUE(db.RemoveFormElementsAddedBetween(t1, Time(), &changes));
 
   const AutofillChange expected_changes[] = {
     AutofillChange(AutofillChange::REMOVE,
                    AutofillKey(ASCIIToUTF16("Name"),
                                ASCIIToUTF16("Superman"))),
     AutofillChange(AutofillChange::REMOVE,
                    AutofillKey(ASCIIToUTF16("Name"),
                                ASCIIToUTF16("Clark Kent"))),
     AutofillChange(AutofillChange::REMOVE,
@@ skipping 18 matching lines @@
 
   EXPECT_TRUE(
       db.GetFormValuesForElementName(ASCIIToUTF16("Name"), string16(), &v, 6));
   EXPECT_EQ(0U, v.size());
 
   // Now add some values with empty strings.
   const string16 kValue = ASCIIToUTF16("  toto   ");
   EXPECT_TRUE(db.AddFormFieldValue(FormField(string16(),
                                              ASCIIToUTF16("blank"),
                                              string16(),
-                                             string16())));
+                                             string16()),
+                                   &changes));
   EXPECT_TRUE(db.AddFormFieldValue(FormField(string16(),
                                              ASCIIToUTF16("blank"),
                                              string16(),
-                                             ASCIIToUTF16(" "))));
+                                             ASCIIToUTF16(" ")),
+                                   &changes));
   EXPECT_TRUE(db.AddFormFieldValue(FormField(string16(),
                                              ASCIIToUTF16("blank"),
                                              string16(),
-                                             ASCIIToUTF16("      "))));
+                                             ASCIIToUTF16("      ")),
+                                   &changes));
   EXPECT_TRUE(db.AddFormFieldValue(FormField(string16(),
                                              ASCIIToUTF16("blank"),
                                              string16(),
-                                             kValue)));
+                                             kValue),
+                                   &changes));
 
   // They should be stored normally as the DB layer does not check for empty
   // values.
   v.clear();
   EXPECT_TRUE(db.GetFormValuesForElementName(
       ASCIIToUTF16("blank"), string16(), &v, 10));
   EXPECT_EQ(4U, v.size());
 
   // Now we'll check that ClearAutofillEmptyValueElements() works as expected.
   db.ClearAutofillEmptyValueElements();
 
   v.clear();
   EXPECT_TRUE(db.GetFormValuesForElementName(ASCIIToUTF16("blank"),
       string16(), &v, 10));
   ASSERT_EQ(1U, v.size());
 
   EXPECT_EQ(kValue, v[0]);
 }
 
 TEST_F(WebDatabaseTest, Autofill_RemoveBetweenChanges) {
   WebDatabase db;
   ASSERT_EQ(sql::INIT_OK, db.Init(file_));
 
   TimeDelta one_day(TimeDelta::FromDays(1));
   Time t1 = Time::Now();
   Time t2 = t1 + one_day;
 
+  AutofillChangeList changes;
   EXPECT_TRUE(db.AddFormFieldValueTime(
       FormField(string16(),
                 ASCIIToUTF16("Name"),
                 string16(),
                 ASCIIToUTF16("Superman")),
+      &changes,
       t1));
   EXPECT_TRUE(db.AddFormFieldValueTime(
       FormField(string16(),
                 ASCIIToUTF16("Name"),
                 string16(),
                 ASCIIToUTF16("Superman")),
+      &changes,
       t2));
 
-  std::vector<AutofillChange> changes;
+  changes.clear();
   EXPECT_TRUE(db.RemoveFormElementsAddedBetween(t1, t2, &changes));
   ASSERT_EQ(1U, changes.size());
   EXPECT_EQ(AutofillChange(AutofillChange::UPDATE,
                              AutofillKey(ASCIIToUTF16("Name"),
                                          ASCIIToUTF16("Superman"))),
             changes[0]);
   changes.clear();
 
   EXPECT_TRUE(db.RemoveFormElementsAddedBetween(t2, t2 + one_day, &changes));
   ASSERT_EQ(1U, changes.size());
   EXPECT_EQ(AutofillChange(AutofillChange::REMOVE,
                              AutofillKey(ASCIIToUTF16("Name"),
                                          ASCIIToUTF16("Superman"))),
             changes[0]);
 }
 
+TEST_F(WebDatabaseTest, Autofill_AddChanges) {
+  WebDatabase db;
+  ASSERT_EQ(sql::INIT_OK, db.Init(file_));
+
+  TimeDelta one_day(TimeDelta::FromDays(1));
+  Time t1 = Time::Now();
+  Time t2 = t1 + one_day;
+
+  AutofillChangeList changes;
+  EXPECT_TRUE(db.AddFormFieldValueTime(
+      FormField(string16(),
+                ASCIIToUTF16("Name"),
+                string16(),
+                ASCIIToUTF16("Superman")),
+      &changes,
+      t1));
+  ASSERT_EQ(1U, changes.size());
+  EXPECT_EQ(AutofillChange(AutofillChange::ADD,
+                             AutofillKey(ASCIIToUTF16("Name"),
+                                         ASCIIToUTF16("Superman"))),
+            changes[0]);
+
+  changes.clear();
+  EXPECT_TRUE(db.AddFormFieldValueTime(
+      FormField(string16(),
+                ASCIIToUTF16("Name"),
+                string16(),
+                ASCIIToUTF16("Superman")),
+      &changes,
+      t2));
+  ASSERT_EQ(1U, changes.size());
+  EXPECT_EQ(AutofillChange(AutofillChange::UPDATE,
+                             AutofillKey(ASCIIToUTF16("Name"),
+                                         ASCIIToUTF16("Superman"))),
+            changes[0]);
+}
+
 static bool AddTimestampedLogin(WebDatabase* db, std::string url,
                                 const std::string& unique_string,
                                 const Time& time) {
   // Example password form.
   PasswordForm form;
   form.origin = GURL(url + std::string("/LoginAuth"));
   form.username_element = ASCIIToUTF16(unique_string);
   form.username_value = ASCIIToUTF16(unique_string);
   form.password_element = ASCIIToUTF16(unique_string);
   form.submit_element = ASCIIToUTF16("signIn");
@@ skipping 174 matching lines @@
     ASSERT_EQ(16, images[0].height());
     ASSERT_EQ(32, images[1].width());
     ASSERT_EQ(32, images[1].height());
   } else {
     ASSERT_EQ(32, images[0].width());
     ASSERT_EQ(32, images[0].height());
     ASSERT_EQ(16, images[1].width());
     ASSERT_EQ(16, images[1].height());
   }
 }