Rename AutoFillForm to FormFieldValues to better reflect the purpose of the data structure.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/306014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29580 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 65 insertions, 59 deletions

diff --git a/chrome/browser/webdata/web_data_service.cc b/chrome/browser/webdata/web_data_service.cc
index cec4e99..cc52def 100644
--- a/chrome/browser/webdata/web_data_service.cc
+++ b/chrome/browser/webdata/web_data_service.cc
@@ -9,8 +9,8 @@
 #include "base/scoped_ptr.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/common/chrome_constants.h"
+#include "webkit/glue/form_field_values.h"
 #include "webkit/glue/password_form.h"
-#include "webkit/glue/autofill_form.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ -19,7 +19,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 using base::Time;
-using webkit_glue::AutofillForm;
+using webkit_glue::FormFieldValues;
 using webkit_glue::PasswordForm;
 
 WebDataService::WebDataService() : thread_(NULL),
@@ -114,14 +114,14 @@ void WebDataService::CancelRequest(Handle h) {
   i->second->Cancel();
 }
 
-void WebDataService::AddAutofillFormElements(
-    const std::vector<AutofillForm::Element>& element) {
-  GenericRequest<std::vector<AutofillForm::Element> >* request =
-      new GenericRequest<std::vector<AutofillForm::Element> >(
+void WebDataService::AddFormFieldValues(
+    const std::vector<FormFieldValues::Element>& element) {
+  GenericRequest<std::vector<FormFieldValues::Element> >* request =
+      new GenericRequest<std::vector<FormFieldValues::Element> >(
           this, GetNextRequestHandle(), NULL, element);
   RegisterRequest(request);
   ScheduleTask(NewRunnableMethod(this,
-                                 &WebDataService::AddAutofillFormElementsImpl,
+                                 &WebDataService::AddFormFieldValuesImpl,
                                  request));
 }
 
@@ -572,10 +572,10 @@ void WebDataService::GetBlacklistLoginsImpl(WebDataRequest* request) {
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-void WebDataService::AddAutofillFormElementsImpl(
-    GenericRequest<std::vector<AutofillForm::Element> >* request) {
+void WebDataService::AddFormFieldValuesImpl(
+    GenericRequest<std::vector<FormFieldValues::Element> >* request) {
   if (db_ && !request->IsCancelled()) {
-    if (db_->AddAutofillFormElements(request->GetArgument()))
+    if (db_->AddFormFieldValues(request->GetArgument()))
       ScheduleCommit();
   }
   request->RequestComplete();
diff --git a/chrome/browser/webdata/web_data_service.h b/chrome/browser/webdata/web_data_service.h
index 03b7766..7226122 100644
--- a/chrome/browser/webdata/web_data_service.h
+++ b/chrome/browser/webdata/web_data_service.h
@@ -15,7 +15,7 @@
 #include "base/scoped_vector.h"
 #include "base/thread.h"
 #include "chrome/browser/webdata/web_database.h"
-#include "webkit/glue/autofill_form.h"
+#include "webkit/glue/form_field_values.h"
 
 #if defined(OS_WIN)
 struct IE7PasswordInfo;
@@ -93,7 +93,7 @@ class WDTypedResult {
   }
 
  protected:
-  WDTypedResult(WDResultType type) : type_(type) {
+  explicit WDTypedResult(WDResultType type) : type_(type) {
   }
 
  private:
@@ -375,8 +375,8 @@ class WebDataService : public base::RefCountedThreadSafe<WebDataService> {
   //////////////////////////////////////////////////////////////////////////////
 
   // Schedules a task to add form elements to the web database.
-  void AddAutofillFormElements(
-      const std::vector<webkit_glue::AutofillForm::Element>& elements);
+  void AddFormFieldValues(
+      const std::vector<webkit_glue::FormFieldValues::Element>& elements);
 
   // Initiates the request for a vector of values which have been entered in
   // form input fields named |name|.  The method OnWebDataServiceRequestDone of
@@ -464,8 +464,8 @@ class WebDataService : public base::RefCountedThreadSafe<WebDataService> {
   // Autofill.
   //
   //////////////////////////////////////////////////////////////////////////////
-  void AddAutofillFormElementsImpl(
-      GenericRequest<std::vector<webkit_glue::AutofillForm::Element> >*
+  void AddFormFieldValuesImpl(
+      GenericRequest<std::vector<webkit_glue::FormFieldValues::Element> >*
           request);
   void GetFormValuesForElementNameImpl(WebDataRequest* request,
       const string16& name, const string16& prefix, int limit);
@@ -480,9 +480,9 @@ class WebDataService : public base::RefCountedThreadSafe<WebDataService> {
   //
   //////////////////////////////////////////////////////////////////////////////
 
-  void SetWebAppImageImpl(GenericRequest2<GURL,SkBitmap>* request);
+  void SetWebAppImageImpl(GenericRequest2<GURL, SkBitmap>* request);
 
-  void SetWebAppHasAllImagesImpl(GenericRequest2<GURL,bool>* request);
+  void SetWebAppHasAllImagesImpl(GenericRequest2<GURL, bool>* request);
 
   void RemoveWebAppImpl(GenericRequest<GURL>* request);
 
diff --git a/chrome/browser/webdata/web_database.cc b/chrome/browser/webdata/web_database.cc
index 3be6268..f611a93 100644
--- a/chrome/browser/webdata/web_database.cc
+++ b/chrome/browser/webdata/web_database.cc
@@ -6,6 +6,7 @@
 
 #include <algorithm>
 #include <limits>
+#include <set>
 #include <vector>
 
 #include "app/gfx/codec/png_codec.h"
@@ -98,7 +99,7 @@ using webkit_glue::PasswordForm;
 ////////////////////////////////////////////////////////////////////////////////
 
 using base::Time;
-using webkit_glue::AutofillForm;
+using webkit_glue::FormFieldValues;
 
 // Current version number.
 static const int kCurrentVersionNumber = 22;
@@ -802,14 +803,14 @@ bool WebDatabase::GetAllLogins(std::vector<PasswordForm*>* forms,
   return s.Succeeded();
 }
 
-bool WebDatabase::AddAutofillFormElements(
-    const std::vector<AutofillForm::Element>& elements) {
+bool WebDatabase::AddFormFieldValues(
+    const std::vector<FormFieldValues::Element>& elements) {
   bool result = true;
-  for (std::vector<AutofillForm::Element>::const_iterator
+  for (std::vector<FormFieldValues::Element>::const_iterator
        itr = elements.begin();
        itr != elements.end();
        itr++) {
-    result = result && AddAutofillFormElement(*itr);
+    result = result && AddFormFieldValue(*itr);
   }
   return result;
 }
@@ -837,7 +838,7 @@ bool WebDatabase::ClearAutofillEmptyValueElements() {
 }
 
 bool WebDatabase::GetIDAndCountOfFormElement(
-    const AutofillForm::Element& element,
+    const FormFieldValues::Element& element,
     int64* pair_id,
     int* count) {
   sql::Statement s(db_.GetUniqueStatement(
@@ -878,7 +879,7 @@ bool WebDatabase::GetCountOfFormElement(int64 pair_id, int* count) {
   return false;
 }
 
-bool WebDatabase::InsertFormElement(const AutofillForm::Element& element,
+bool WebDatabase::InsertFormElement(const FormFieldValues::Element& element,
                                     int64* pair_id) {
   sql::Statement s(db_.GetUniqueStatement(
       "INSERT INTO autofill (name, value, value_lower) VALUES (?,?,?)"));
@@ -939,7 +940,7 @@ bool WebDatabase::SetCountOfFormElement(int64 pair_id, int count) {
   return true;
 }
 
-bool WebDatabase::AddAutofillFormElement(const AutofillForm::Element& element) {
+bool WebDatabase::AddFormFieldValue(const FormFieldValues::Element& element) {
   int count = 0;
   int64 pair_id;
 
diff --git a/chrome/browser/webdata/web_database.h b/chrome/browser/webdata/web_database.h
index 1326c18..cc73e9b 100644
--- a/chrome/browser/webdata/web_database.h
+++ b/chrome/browser/webdata/web_database.h
@@ -14,7 +14,7 @@
 #include "chrome/browser/search_engines/template_url.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
-#include "webkit/glue/autofill_form.h"
+#include "webkit/glue/form_field_values.h"
 
 class FilePath;
 
@@ -132,12 +132,12 @@ class WebDatabase {
 
   // Records the form elements in |elements| in the database in the autofill
   // table.
-  bool AddAutofillFormElements(
-      const std::vector<webkit_glue::AutofillForm::Element>& elements);
+  bool AddFormFieldValues(
+      const std::vector<webkit_glue::FormFieldValues::Element>& elements);
 
   // Records a single form element in in the database in the autofill table.
-  bool AddAutofillFormElement(
-      const webkit_glue::AutofillForm::Element& element);
+  bool AddFormFieldValue(
+      const webkit_glue::FormFieldValues::Element& element);
 
   // Retrieves a vector of all values which have been recorded in the autofill
   // table as the value in a form element with name |name| and which start with
@@ -168,7 +168,7 @@ class WebDatabase {
   // Gets the pair_id and count entries from name and value specified in
   // |element|.  Sets *count to 0 if there is no such row in the table.
   bool GetIDAndCountOfFormElement(
-      const webkit_glue::AutofillForm::Element& element,
+      const webkit_glue::FormFieldValues::Element& element,
       int64* pair_id,
       int* count);
 
@@ -181,7 +181,7 @@ class WebDatabase {
   // Adds a new row to the autofill table with name and value given in
   // |element|.  Sets *pair_id to the pair_id of the new row.
   bool InsertFormElement(
-      const webkit_glue::AutofillForm::Element& element,
+      const webkit_glue::FormFieldValues::Element& element,
       int64* pair_id);
 
   // Adds a new row to the autofill_dates table.
diff --git a/chrome/browser/webdata/web_database_unittest.cc b/chrome/browser/webdata/web_database_unittest.cc
index 1d7569b..32001e5 100644
--- a/chrome/browser/webdata/web_database_unittest.cc
+++ b/chrome/browser/webdata/web_database_unittest.cc
@@ -13,12 +13,12 @@
 #include "chrome/common/chrome_paths.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/glue/autofill_form.h"
+#include "webkit/glue/form_field_values.h"
 #include "webkit/glue/password_form.h"
 
 using base::Time;
 using base::TimeDelta;
-using webkit_glue::AutofillForm;
+using webkit_glue::FormFieldValues;
 using webkit_glue::PasswordForm;
 
 class WebDatabaseTest : public testing::Test {
@@ -391,23 +391,24 @@ 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.AddAutofillFormElement(
-      AutofillForm::Element(ASCIIToUTF16("Name"), ASCIIToUTF16("Superman"))));
+  EXPECT_TRUE(db.AddFormFieldValue(
+      FormFieldValues::Element(ASCIIToUTF16("Name"),
+                               ASCIIToUTF16("Superman"))));
   std::vector<string16> v;
   for (int i = 0; i < 5; i++) {
-    EXPECT_TRUE(db.AddAutofillFormElement(
-        AutofillForm::Element(ASCIIToUTF16("Name"),
-                              ASCIIToUTF16("Clark Kent"))));
+    EXPECT_TRUE(db.AddFormFieldValue(
+        FormFieldValues::Element(ASCIIToUTF16("Name"),
+                                 ASCIIToUTF16("Clark Kent"))));
   }
   for (int i = 0; i < 3; i++) {
-    EXPECT_TRUE(db.AddAutofillFormElement(
-        AutofillForm::Element(ASCIIToUTF16("Name"),
-                              ASCIIToUTF16("Clark Sutter"))));
+    EXPECT_TRUE(db.AddFormFieldValue(
+        FormFieldValues::Element(ASCIIToUTF16("Name"),
+                                 ASCIIToUTF16("Clark Sutter"))));
   }
   for (int i = 0; i < 2; i++) {
-    EXPECT_TRUE(db.AddAutofillFormElement(
-        AutofillForm::Element(ASCIIToUTF16("Favorite Color"),
-                              ASCIIToUTF16("Green"))));
+    EXPECT_TRUE(db.AddFormFieldValue(
+        FormFieldValues::Element(ASCIIToUTF16("Favorite Color"),
+                                 ASCIIToUTF16("Green"))));
   }
 
   int count = 0;
@@ -416,7 +417,8 @@ 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(
-      AutofillForm::Element(ASCIIToUTF16("Name"), ASCIIToUTF16("Clark Kent")),
+      FormFieldValues::Element(ASCIIToUTF16("Name"),
+                               ASCIIToUTF16("Clark Kent")),
       &pair_id, &count));
   EXPECT_EQ(5, count);
   EXPECT_NE(0, pair_id);
@@ -424,12 +426,13 @@ 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(
-      AutofillForm::Element(ASCIIToUTF16("Name"), ASCIIToUTF16("clark kent")),
+      FormFieldValues::Element(ASCIIToUTF16("Name"),
+                               ASCIIToUTF16("clark kent")),
       &pair_id, &count));
   EXPECT_EQ(0, count);
 
   EXPECT_TRUE(db.GetIDAndCountOfFormElement(
-      AutofillForm::Element(ASCIIToUTF16("Favorite Color"),
+      FormFieldValues::Element(ASCIIToUTF16("Favorite Color"),
                             ASCIIToUTF16("Green")),
       &pair_id, &count));
   EXPECT_EQ(2, count);
@@ -471,7 +474,8 @@ TEST_F(WebDatabaseTest, Autofill) {
   EXPECT_TRUE(db.RemoveFormElementsAddedBetween(t1, Time()));
 
   EXPECT_TRUE(db.GetIDAndCountOfFormElement(
-      AutofillForm::Element(ASCIIToUTF16("Name"), ASCIIToUTF16("Clark Kent")),
+      FormFieldValues::Element(ASCIIToUTF16("Name"),
+                               ASCIIToUTF16("Clark Kent")),
       &pair_id, &count));
   EXPECT_EQ(0, count);
 
@@ -481,14 +485,14 @@ TEST_F(WebDatabaseTest, Autofill) {
 
   // Now add some values with empty strings.
   const string16 kValue = ASCIIToUTF16("  toto   ");
-  EXPECT_TRUE(db.AddAutofillFormElement(
-      AutofillForm::Element(ASCIIToUTF16("blank"), string16())));
-  EXPECT_TRUE(db.AddAutofillFormElement(
-      AutofillForm::Element(ASCIIToUTF16("blank"), ASCIIToUTF16(" "))));
-  EXPECT_TRUE(db.AddAutofillFormElement(
-      AutofillForm::Element(ASCIIToUTF16("blank"), ASCIIToUTF16("      "))));
-  EXPECT_TRUE(db.AddAutofillFormElement(
-      AutofillForm::Element(ASCIIToUTF16("blank"), kValue)));
+  EXPECT_TRUE(db.AddFormFieldValue(
+      FormFieldValues::Element(ASCIIToUTF16("blank"), string16())));
+  EXPECT_TRUE(db.AddFormFieldValue(
+      FormFieldValues::Element(ASCIIToUTF16("blank"), ASCIIToUTF16(" "))));
+  EXPECT_TRUE(db.AddFormFieldValue(
+      FormFieldValues::Element(ASCIIToUTF16("blank"), ASCIIToUTF16("      "))));
+  EXPECT_TRUE(db.AddFormFieldValue(
+      FormFieldValues::Element(ASCIIToUTF16("blank"), kValue)));
 
   // They should be stored normally as the DB layer does not check for empty
   // values.
@@ -501,7 +505,8 @@ TEST_F(WebDatabaseTest, Autofill) {
   db.ClearAutofillEmptyValueElements();
 
   v.clear();
-  EXPECT_TRUE(db.GetFormValuesForElementName(ASCIIToUTF16("blank"), string16(), &v, 10));
+  EXPECT_TRUE(db.GetFormValuesForElementName(ASCIIToUTF16("blank"),
+      string16(), &v, 10));
   ASSERT_EQ(1U, v.size());
 
   EXPECT_EQ(kValue, v[0]);