summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/autocomplete_history_manager.cc8
-rw-r--r--chrome/browser/autofill/address_field_unittest.cc42
-rw-r--r--chrome/browser/autofill/form_structure.cc11
-rw-r--r--chrome/browser/autofill/form_structure_unittest.cc130
-rw-r--r--chrome/browser/autofill/phone_field_unittest.cc24
-rw-r--r--chrome/browser/webdata/web_data_service_unittest.cc3
-rw-r--r--chrome/browser/webdata/web_database_unittest.cc78
7 files changed, 102 insertions, 194 deletions
diff --git a/chrome/browser/autocomplete_history_manager.cc b/chrome/browser/autocomplete_history_manager.cc
index 1643636..280ea85 100644
--- a/chrome/browser/autocomplete_history_manager.cc
+++ b/chrome/browser/autocomplete_history_manager.cc
@@ -109,18 +109,16 @@ void AutocompleteHistoryManager::StoreFormEntriesInWebDatabase(
return;
// We put the following restriction on stored FormFields:
- // - input_type() == WebInputElement::Text
// - non-empty name
// - non-empty value
- // - non-empty form_control_type()
+ // - text field
std::vector<webkit_glue::FormField> values;
for (std::vector<webkit_glue::FormField>::const_iterator iter =
form.elements.begin();
iter != form.elements.end(); ++iter) {
- if (iter->input_type() == WebKit::WebInputElement::Text &&
- !iter->value().empty() &&
+ if (!iter->value().empty() &&
!iter->name().empty() &&
- !iter->form_control_type().empty())
+ iter->form_control_type() == ASCIIToUTF16("text"))
values.push_back(*iter);
}
diff --git a/chrome/browser/autofill/address_field_unittest.cc b/chrome/browser/autofill/address_field_unittest.cc
index ea41876..bbcbcf2 100644
--- a/chrome/browser/autofill/address_field_unittest.cc
+++ b/chrome/browser/autofill/address_field_unittest.cc
@@ -45,8 +45,7 @@ TEST_F(AddressFieldTest, ParseOneLineAddress) {
new AutoFillField(webkit_glue::FormField(ASCIIToUTF16("Address"),
ASCIIToUTF16("address"),
string16(),
- ASCIIToUTF16("text"),
- WebKit::WebInputElement::Text),
+ ASCIIToUTF16("text")),
ASCIIToUTF16("addr1")));
list_.push_back(NULL);
iter_ = list_.begin();
@@ -65,8 +64,7 @@ TEST_F(AddressFieldTest, ParseOneLineAddressEcml) {
new AutoFillField(webkit_glue::FormField(ASCIIToUTF16("Address"),
kEcmlShipToAddress1,
string16(),
- ASCIIToUTF16("text"),
- WebKit::WebInputElement::Text),
+ ASCIIToUTF16("text")),
ASCIIToUTF16("addr1")));
list_.push_back(NULL);
iter_ = list_.begin();
@@ -85,15 +83,13 @@ TEST_F(AddressFieldTest, ParseTwoLineAddress) {
new AutoFillField(webkit_glue::FormField(ASCIIToUTF16("Address"),
ASCIIToUTF16("address"),
string16(),
- ASCIIToUTF16("text"),
- WebKit::WebInputElement::Text),
+ ASCIIToUTF16("text")),
ASCIIToUTF16("addr1")));
list_.push_back(
new AutoFillField(webkit_glue::FormField(string16(),
string16(),
string16(),
- ASCIIToUTF16("text"),
- WebKit::WebInputElement::Text),
+ ASCIIToUTF16("text")),
ASCIIToUTF16("addr2")));
list_.push_back(NULL);
iter_ = list_.begin();
@@ -115,15 +111,13 @@ TEST_F(AddressFieldTest, ParseTwoLineAddressEcml) {
new AutoFillField(webkit_glue::FormField(ASCIIToUTF16("Address"),
kEcmlShipToAddress1,
string16(),
- ASCIIToUTF16("text"),
- WebKit::WebInputElement::Text),
+ ASCIIToUTF16("text")),
ASCIIToUTF16("addr1")));
list_.push_back(
new AutoFillField(webkit_glue::FormField(string16(),
kEcmlShipToAddress2,
string16(),
- ASCIIToUTF16("text"),
- WebKit::WebInputElement::Text),
+ ASCIIToUTF16("text")),
ASCIIToUTF16("addr2")));
list_.push_back(NULL);
iter_ = list_.begin();
@@ -145,8 +139,7 @@ TEST_F(AddressFieldTest, ParseCity) {
new AutoFillField(webkit_glue::FormField(ASCIIToUTF16("City"),
ASCIIToUTF16("city"),
string16(),
- ASCIIToUTF16("text"),
- WebKit::WebInputElement::Text),
+ ASCIIToUTF16("text")),
ASCIIToUTF16("city1")));
list_.push_back(NULL);
iter_ = list_.begin();
@@ -165,8 +158,7 @@ TEST_F(AddressFieldTest, ParseCityEcml) {
new AutoFillField(webkit_glue::FormField(ASCIIToUTF16("City"),
kEcmlShipToCity,
string16(),
- ASCIIToUTF16("text"),
- WebKit::WebInputElement::Text),
+ ASCIIToUTF16("text")),
ASCIIToUTF16("city1")));
list_.push_back(NULL);
iter_ = list_.begin();
@@ -185,8 +177,7 @@ TEST_F(AddressFieldTest, ParseState) {
new AutoFillField(webkit_glue::FormField(ASCIIToUTF16("State"),
ASCIIToUTF16("state"),
string16(),
- ASCIIToUTF16("text"),
- WebKit::WebInputElement::Text),
+ ASCIIToUTF16("text")),
ASCIIToUTF16("state1")));
list_.push_back(NULL);
iter_ = list_.begin();
@@ -205,8 +196,7 @@ TEST_F(AddressFieldTest, ParseStateEcml) {
new AutoFillField(webkit_glue::FormField(ASCIIToUTF16("State"),
kEcmlShipToStateProv,
string16(),
- ASCIIToUTF16("text"),
- WebKit::WebInputElement::Text),
+ ASCIIToUTF16("text")),
ASCIIToUTF16("state1")));
list_.push_back(NULL);
iter_ = list_.begin();
@@ -225,8 +215,7 @@ TEST_F(AddressFieldTest, ParseZip) {
new AutoFillField(webkit_glue::FormField(ASCIIToUTF16("Zip"),
ASCIIToUTF16("zip"),
string16(),
- ASCIIToUTF16("text"),
- WebKit::WebInputElement::Text),
+ ASCIIToUTF16("text")),
ASCIIToUTF16("zip1")));
list_.push_back(NULL);
iter_ = list_.begin();
@@ -245,8 +234,7 @@ TEST_F(AddressFieldTest, ParseZipEcml) {
new AutoFillField(webkit_glue::FormField(ASCIIToUTF16("Zip"),
kEcmlShipToPostalCode,
string16(),
- ASCIIToUTF16("text"),
- WebKit::WebInputElement::Text),
+ ASCIIToUTF16("text")),
ASCIIToUTF16("zip1")));
list_.push_back(NULL);
iter_ = list_.begin();
@@ -265,8 +253,7 @@ TEST_F(AddressFieldTest, ParseCountry) {
new AutoFillField(webkit_glue::FormField(ASCIIToUTF16("Country"),
ASCIIToUTF16("country"),
string16(),
- ASCIIToUTF16("text"),
- WebKit::WebInputElement::Text),
+ ASCIIToUTF16("text")),
ASCIIToUTF16("country1")));
list_.push_back(NULL);
iter_ = list_.begin();
@@ -285,8 +272,7 @@ TEST_F(AddressFieldTest, ParseCountryEcml) {
new AutoFillField(webkit_glue::FormField(ASCIIToUTF16("Country"),
kEcmlShipToCountry,
string16(),
- ASCIIToUTF16("text"),
- WebKit::WebInputElement::Text),
+ ASCIIToUTF16("text")),
ASCIIToUTF16("country1")));
list_.push_back(NULL);
iter_ = list_.begin();
diff --git a/chrome/browser/autofill/form_structure.cc b/chrome/browser/autofill/form_structure.cc
index dd9cfaa..8628036 100644
--- a/chrome/browser/autofill/form_structure.cc
+++ b/chrome/browser/autofill/form_structure.cc
@@ -34,7 +34,8 @@ const char* const kXMLElementForm = "form";
const char* const kXMLElementField = "field";
const char* const kAttributeAutoFillType = "autofilltype";
-// The only form control type we handle currently.
+// The list of form control types we handle.
+const char* const kControlTypeSelect = "select-one";
const char* const kControlTypeText = "text";
// The number of fillable fields necessary for a form to be fillable.
@@ -66,9 +67,11 @@ FormStructure::FormStructure(const FormFieldValues& values)
std::vector<webkit_glue::FormField>::const_iterator field;
for (field = values.elements.begin();
field != values.elements.end(); field++) {
- // We currently only handle text fields. This prevents us from thinking we
- // can autofill other types of controls, e.g., select, password, hidden.
- if (!LowerCaseEqualsASCII(field->form_control_type(), kControlTypeText))
+ // We currently only handle text and seleect fields. This prevents us from
+ // thinking we can autofill other types of controls, e.g., password, hidden,
+ // submit.
+ if (!LowerCaseEqualsASCII(field->form_control_type(), kControlTypeText) &&
+ !LowerCaseEqualsASCII(field->form_control_type(), kControlTypeSelect))
continue;
// Generate a unique name for this field by appending a counter to the name.
diff --git a/chrome/browser/autofill/form_structure_unittest.cc b/chrome/browser/autofill/form_structure_unittest.cc
index a8283a5..5b310b4 100644
--- a/chrome/browser/autofill/form_structure_unittest.cc
+++ b/chrome/browser/autofill/form_structure_unittest.cc
@@ -20,19 +20,15 @@ TEST(FormStructureTest, FieldCount) {
values.elements.push_back(webkit_glue::FormField(ASCIIToUTF16("username"),
ASCIIToUTF16("username"),
string16(),
- ASCIIToUTF16("text"),
- WebInputElement::Text));
+ ASCIIToUTF16("text")));
values.elements.push_back(webkit_glue::FormField(ASCIIToUTF16("password"),
ASCIIToUTF16("password"),
string16(),
- ASCIIToUTF16("password"),
- WebInputElement::Password));
+ ASCIIToUTF16("password")));
values.elements.push_back(webkit_glue::FormField(string16(),
ASCIIToUTF16("Submit"),
string16(),
- ASCIIToUTF16("submit"),
- WebInputElement::Submit));
-
+ ASCIIToUTF16("submit")));
FormStructure form_structure(values);
// Only text fields are counted.
@@ -48,18 +44,15 @@ TEST(FormStructureTest, IsAutoFillable) {
values.elements.push_back(webkit_glue::FormField(ASCIIToUTF16("username"),
ASCIIToUTF16("username"),
string16(),
- ASCIIToUTF16("text"),
- WebInputElement::Text));
+ ASCIIToUTF16("text")));
values.elements.push_back(webkit_glue::FormField(ASCIIToUTF16("password"),
ASCIIToUTF16("password"),
string16(),
- ASCIIToUTF16("password"),
- WebInputElement::Password));
+ ASCIIToUTF16("password")));
values.elements.push_back(webkit_glue::FormField(string16(),
ASCIIToUTF16("Submit"),
string16(),
- ASCIIToUTF16("submit"),
- WebInputElement::Submit));
+ ASCIIToUTF16("submit")));
form_structure.reset(new FormStructure(values));
EXPECT_FALSE(form_structure->IsAutoFillable());
@@ -67,13 +60,11 @@ TEST(FormStructureTest, IsAutoFillable) {
values.elements.push_back(webkit_glue::FormField(ASCIIToUTF16("First Name"),
ASCIIToUTF16("firstname"),
string16(),
- ASCIIToUTF16("text"),
- WebInputElement::Text));
+ ASCIIToUTF16("text")));
values.elements.push_back(webkit_glue::FormField(ASCIIToUTF16("Last Name"),
ASCIIToUTF16("lastname"),
string16(),
- ASCIIToUTF16("text"),
- WebInputElement::Text));
+ ASCIIToUTF16("text")));
form_structure.reset(new FormStructure(values));
EXPECT_TRUE(form_structure->IsAutoFillable());
@@ -102,48 +93,39 @@ TEST(FormStructureTest, Heuristics) {
values.elements.push_back(webkit_glue::FormField(ASCIIToUTF16("First Name"),
ASCIIToUTF16("firstname"),
string16(),
- ASCIIToUTF16("text"),
- WebInputElement::Text));
+ ASCIIToUTF16("text")));
values.elements.push_back(webkit_glue::FormField(ASCIIToUTF16("Last Name"),
ASCIIToUTF16("lastname"),
string16(),
- ASCIIToUTF16("text"),
- WebInputElement::Text));
+ ASCIIToUTF16("text")));
values.elements.push_back(webkit_glue::FormField(ASCIIToUTF16("EMail"),
ASCIIToUTF16("email"),
string16(),
- ASCIIToUTF16("text"),
- WebInputElement::Text));
+ ASCIIToUTF16("text")));
values.elements.push_back(webkit_glue::FormField(ASCIIToUTF16("Phone"),
ASCIIToUTF16("phone"),
string16(),
- ASCIIToUTF16("text"),
- WebInputElement::Text));
+ ASCIIToUTF16("text")));
values.elements.push_back(webkit_glue::FormField(ASCIIToUTF16("Fax"),
ASCIIToUTF16("fax"),
string16(),
- ASCIIToUTF16("text"),
- WebInputElement::Text));
+ ASCIIToUTF16("text")));
values.elements.push_back(webkit_glue::FormField(ASCIIToUTF16("Address"),
ASCIIToUTF16("address"),
string16(),
- ASCIIToUTF16("text"),
- WebInputElement::Text));
+ ASCIIToUTF16("text")));
values.elements.push_back(webkit_glue::FormField(ASCIIToUTF16("City"),
ASCIIToUTF16("city"),
string16(),
- ASCIIToUTF16("text"),
- WebInputElement::Text));
+ ASCIIToUTF16("text")));
values.elements.push_back(webkit_glue::FormField(ASCIIToUTF16("Zip code"),
ASCIIToUTF16("zipcode"),
string16(),
- ASCIIToUTF16("text"),
- WebInputElement::Text));
+ ASCIIToUTF16("text")));
values.elements.push_back(webkit_glue::FormField(string16(),
ASCIIToUTF16("Submit"),
string16(),
- ASCIIToUTF16("submit"),
- WebInputElement::Submit));
+ ASCIIToUTF16("submit")));
form_structure.reset(new FormStructure(values));
EXPECT_TRUE(form_structure->IsAutoFillable());
@@ -198,62 +180,52 @@ TEST(FormStructureTest, HeuristicsSample8) {
webkit_glue::FormField(ASCIIToUTF16("Your First Name:"),
ASCIIToUTF16("bill.first"),
string16(),
- ASCIIToUTF16("text"),
- WebInputElement::Text));
+ ASCIIToUTF16("text")));
values.elements.push_back(
webkit_glue::FormField(ASCIIToUTF16("Your Last Name:"),
ASCIIToUTF16("bill.last"),
string16(),
- ASCIIToUTF16("text"),
- WebInputElement::Text));
+ ASCIIToUTF16("text")));
values.elements.push_back(
webkit_glue::FormField(ASCIIToUTF16("Street Address Line 1:"),
ASCIIToUTF16("bill.street1"),
string16(),
- ASCIIToUTF16("text"),
- WebInputElement::Text));
+ ASCIIToUTF16("text")));
values.elements.push_back(
webkit_glue::FormField(ASCIIToUTF16("Street Address Line 2:"),
ASCIIToUTF16("bill.street2"),
string16(),
- ASCIIToUTF16("text"),
- WebInputElement::Text));
+ ASCIIToUTF16("text")));
values.elements.push_back(
webkit_glue::FormField(ASCIIToUTF16("City:"),
ASCIIToUTF16("bill.city"),
string16(),
- ASCIIToUTF16("text"),
- WebInputElement::Text));
+ ASCIIToUTF16("text")));
values.elements.push_back(
webkit_glue::FormField(ASCIIToUTF16("State (U.S.):"),
ASCIIToUTF16("bill.state"),
string16(),
- ASCIIToUTF16("text"),
- WebInputElement::Text));
+ ASCIIToUTF16("text")));
values.elements.push_back(
webkit_glue::FormField(ASCIIToUTF16("Zip/Postal Code:"),
ASCIIToUTF16("BillTo.PostalCode"),
string16(),
- ASCIIToUTF16("text"),
- WebInputElement::Text));
+ ASCIIToUTF16("text")));
values.elements.push_back(
webkit_glue::FormField(ASCIIToUTF16("Country:"),
ASCIIToUTF16("bill.country"),
string16(),
- ASCIIToUTF16("text"),
- WebInputElement::Text));
+ ASCIIToUTF16("text")));
values.elements.push_back(
webkit_glue::FormField(ASCIIToUTF16("Phone Number:"),
ASCIIToUTF16("BillTo.Phone"),
string16(),
- ASCIIToUTF16("text"),
- WebInputElement::Text));
+ ASCIIToUTF16("text")));
values.elements.push_back(
webkit_glue::FormField(string16(),
ASCIIToUTF16("Submit"),
string16(),
- ASCIIToUTF16("submit"),
- WebInputElement::Submit));
+ ASCIIToUTF16("submit")));
form_structure.reset(new FormStructure(values));
EXPECT_TRUE(form_structure->IsAutoFillable());
@@ -307,46 +279,39 @@ TEST(FormStructureTest, HeuristicsSample6) {
webkit_glue::FormField(ASCIIToUTF16("E-mail address"),
ASCIIToUTF16("email"),
string16(),
- ASCIIToUTF16("text"),
- WebInputElement::Text));
+ ASCIIToUTF16("text")));
values.elements.push_back(
webkit_glue::FormField(ASCIIToUTF16("Full name"),
ASCIIToUTF16("name"),
string16(),
- ASCIIToUTF16("text"),
- WebInputElement::Text));
+ ASCIIToUTF16("text")));
values.elements.push_back(
webkit_glue::FormField(ASCIIToUTF16("Company"),
ASCIIToUTF16("company"),
string16(),
- ASCIIToUTF16("text"),
- WebInputElement::Text));
+ ASCIIToUTF16("text")));
values.elements.push_back(
webkit_glue::FormField(ASCIIToUTF16("Address"),
ASCIIToUTF16("address"),
string16(),
- ASCIIToUTF16("text"),
- WebInputElement::Text));
+ ASCIIToUTF16("text")));
values.elements.push_back(
webkit_glue::FormField(ASCIIToUTF16("City"),
ASCIIToUTF16("city"),
string16(),
- ASCIIToUTF16("text"),
- WebInputElement::Text));
+ ASCIIToUTF16("text")));
// TODO(jhawkins): Add state select control.
values.elements.push_back(
webkit_glue::FormField(ASCIIToUTF16("Zip Code"),
ASCIIToUTF16("Home.PostalCode"),
string16(),
- ASCIIToUTF16("text"),
- WebInputElement::Text));
+ ASCIIToUTF16("text")));
// TODO(jhawkins): Phone number.
values.elements.push_back(
webkit_glue::FormField(string16(),
ASCIIToUTF16("Submit"),
ASCIIToUTF16("continue"),
- ASCIIToUTF16("submit"),
- WebInputElement::Submit));
+ ASCIIToUTF16("submit")));
form_structure.reset(new FormStructure(values));
EXPECT_TRUE(form_structure->IsAutoFillable());
@@ -395,48 +360,39 @@ TEST(FormStructureTest, HeuristicsLabelsOnly) {
values.elements.push_back(webkit_glue::FormField(ASCIIToUTF16("First Name"),
string16(),
string16(),
- ASCIIToUTF16("text"),
- WebInputElement::Text));
+ ASCIIToUTF16("text")));
values.elements.push_back(webkit_glue::FormField(ASCIIToUTF16("Last Name"),
string16(),
string16(),
- ASCIIToUTF16("text"),
- WebInputElement::Text));
+ ASCIIToUTF16("text")));
values.elements.push_back(webkit_glue::FormField(ASCIIToUTF16("EMail"),
string16(),
string16(),
- ASCIIToUTF16("text"),
- WebInputElement::Text));
+ ASCIIToUTF16("text")));
values.elements.push_back(webkit_glue::FormField(ASCIIToUTF16("Phone"),
string16(),
string16(),
- ASCIIToUTF16("text"),
- WebInputElement::Text));
+ ASCIIToUTF16("text")));
values.elements.push_back(webkit_glue::FormField(ASCIIToUTF16("Fax"),
string16(),
string16(),
- ASCIIToUTF16("text"),
- WebInputElement::Text));
+ ASCIIToUTF16("text")));
values.elements.push_back(webkit_glue::FormField(ASCIIToUTF16("Address"),
string16(),
string16(),
- ASCIIToUTF16("text"),
- WebInputElement::Text));
+ ASCIIToUTF16("text")));
values.elements.push_back(webkit_glue::FormField(ASCIIToUTF16("Address"),
string16(),
string16(),
- ASCIIToUTF16("text"),
- WebInputElement::Text));
+ ASCIIToUTF16("text")));
values.elements.push_back(webkit_glue::FormField(ASCIIToUTF16("Zip code"),
string16(),
string16(),
- ASCIIToUTF16("text"),
- WebInputElement::Text));
+ ASCIIToUTF16("text")));
values.elements.push_back(webkit_glue::FormField(string16(),
ASCIIToUTF16("Submit"),
string16(),
- ASCIIToUTF16("submit"),
- WebInputElement::Submit));
+ ASCIIToUTF16("submit")));
form_structure.reset(new FormStructure(values));
EXPECT_TRUE(form_structure->IsAutoFillable());
diff --git a/chrome/browser/autofill/phone_field_unittest.cc b/chrome/browser/autofill/phone_field_unittest.cc
index cef9bb4..e12e894 100644
--- a/chrome/browser/autofill/phone_field_unittest.cc
+++ b/chrome/browser/autofill/phone_field_unittest.cc
@@ -45,8 +45,7 @@ TEST_F(PhoneFieldTest, ParseOneLinePhone) {
new AutoFillField(webkit_glue::FormField(ASCIIToUTF16("Phone"),
ASCIIToUTF16("phone"),
string16(),
- ASCIIToUTF16("text"),
- WebKit::WebInputElement::Text),
+ ASCIIToUTF16("text")),
ASCIIToUTF16("phone1")));
list_.push_back(NULL);
iter_ = list_.begin();
@@ -63,8 +62,7 @@ TEST_F(PhoneFieldTest, ParseOneLinePhoneEcml) {
new AutoFillField(webkit_glue::FormField(ASCIIToUTF16("Phone"),
kEcmlShipToPhone,
string16(),
- ASCIIToUTF16("text"),
- WebKit::WebInputElement::Text),
+ ASCIIToUTF16("text")),
ASCIIToUTF16("phone1")));
list_.push_back(NULL);
iter_ = list_.begin();
@@ -81,15 +79,13 @@ TEST_F(PhoneFieldTest, ParseTwoLinePhone) {
new AutoFillField(webkit_glue::FormField(ASCIIToUTF16("Area Code"),
ASCIIToUTF16("area code"),
string16(),
- ASCIIToUTF16("text"),
- WebKit::WebInputElement::Text),
+ ASCIIToUTF16("text")),
ASCIIToUTF16("areacode1")));
list_.push_back(
new AutoFillField(webkit_glue::FormField(ASCIIToUTF16("Phone"),
ASCIIToUTF16("phone"),
string16(),
- ASCIIToUTF16("text"),
- WebKit::WebInputElement::Text),
+ ASCIIToUTF16("text")),
ASCIIToUTF16("phone1")));
list_.push_back(NULL);
iter_ = list_.begin();
@@ -109,15 +105,13 @@ TEST_F(PhoneFieldTest, ParseTwoLinePhoneEcmlShipTo) {
new AutoFillField(webkit_glue::FormField(ASCIIToUTF16("Area Code"),
kEcmlShipToPostalCode,
string16(),
- ASCIIToUTF16("text"),
- WebKit::WebInputElement::Text),
+ ASCIIToUTF16("text")),
ASCIIToUTF16("areacode1")));
list_.push_back(
new AutoFillField(webkit_glue::FormField(ASCIIToUTF16("Phone"),
kEcmlShipToPhone,
string16(),
- ASCIIToUTF16("text"),
- WebKit::WebInputElement::Text),
+ ASCIIToUTF16("text")),
ASCIIToUTF16("phone1")));
list_.push_back(NULL);
iter_ = list_.begin();
@@ -137,15 +131,13 @@ TEST_F(PhoneFieldTest, ParseTwoLinePhoneEcmlBillTo) {
new AutoFillField(webkit_glue::FormField(ASCIIToUTF16("Area Code"),
kEcmlBillToPostalCode,
string16(),
- ASCIIToUTF16("text"),
- WebKit::WebInputElement::Text),
+ ASCIIToUTF16("text")),
ASCIIToUTF16("areacode1")));
list_.push_back(
new AutoFillField(webkit_glue::FormField(ASCIIToUTF16("Phone"),
kEcmlBillToPhone,
string16(),
- ASCIIToUTF16("text"),
- WebKit::WebInputElement::Text),
+ ASCIIToUTF16("text")),
ASCIIToUTF16("phone1")));
list_.push_back(NULL);
iter_ = list_.begin();
diff --git a/chrome/browser/webdata/web_data_service_unittest.cc b/chrome/browser/webdata/web_data_service_unittest.cc
index 1797138..d615902 100644
--- a/chrome/browser/webdata/web_data_service_unittest.cc
+++ b/chrome/browser/webdata/web_data_service_unittest.cc
@@ -192,8 +192,7 @@ class WebDataServiceAutofillTest : public WebDataServiceTest {
webkit_glue::FormField(string16(),
name,
value,
- string16(),
- WebKit::WebInputElement::Text));
+ string16()));
}
string16 name1_;
diff --git a/chrome/browser/webdata/web_database_unittest.cc b/chrome/browser/webdata/web_database_unittest.cc
index 1482f84..e1b58c5 100644
--- a/chrome/browser/webdata/web_database_unittest.cc
+++ b/chrome/browser/webdata/web_database_unittest.cc
@@ -479,8 +479,7 @@ TEST_F(WebDatabaseTest, Autofill) {
FormField(string16(),
ASCIIToUTF16("Name"),
ASCIIToUTF16("Superman"),
- string16(),
- WebKit::WebInputElement::Text),
+ string16()),
&changes));
std::vector<string16> v;
for (int i = 0; i < 5; i++) {
@@ -488,8 +487,7 @@ TEST_F(WebDatabaseTest, Autofill) {
FormField(string16(),
ASCIIToUTF16("Name"),
ASCIIToUTF16("Clark Kent"),
- string16(),
- WebKit::WebInputElement::Text),
+ string16()),
&changes));
}
for (int i = 0; i < 3; i++) {
@@ -497,8 +495,7 @@ TEST_F(WebDatabaseTest, Autofill) {
FormField(string16(),
ASCIIToUTF16("Name"),
ASCIIToUTF16("Clark Sutter"),
- string16(),
- WebKit::WebInputElement::Text),
+ string16()),
&changes));
}
for (int i = 0; i < 2; i++) {
@@ -506,8 +503,7 @@ TEST_F(WebDatabaseTest, Autofill) {
FormField(string16(),
ASCIIToUTF16("Favorite Color"),
ASCIIToUTF16("Green"),
- string16(),
- WebKit::WebInputElement::Text),
+ string16()),
&changes));
}
@@ -520,8 +516,7 @@ TEST_F(WebDatabaseTest, Autofill) {
FormField(string16(),
ASCIIToUTF16("Name"),
ASCIIToUTF16("Clark Kent"),
- string16(),
- WebKit::WebInputElement::Text),
+ string16()),
&pair_id, &count));
EXPECT_EQ(5, count);
EXPECT_NE(0, pair_id);
@@ -532,8 +527,7 @@ TEST_F(WebDatabaseTest, Autofill) {
FormField(string16(),
ASCIIToUTF16("Name"),
ASCIIToUTF16("clark kent"),
- string16(),
- WebKit::WebInputElement::Text),
+ string16()),
&pair_id, &count));
EXPECT_EQ(0, count);
@@ -541,8 +535,7 @@ TEST_F(WebDatabaseTest, Autofill) {
FormField(string16(),
ASCIIToUTF16("Favorite Color"),
ASCIIToUTF16("Green"),
- string16(),
- WebKit::WebInputElement::Text),
+ string16()),
&pair_id, &count));
EXPECT_EQ(2, count);
@@ -606,8 +599,7 @@ TEST_F(WebDatabaseTest, Autofill) {
FormField(string16(),
ASCIIToUTF16("Name"),
ASCIIToUTF16("Clark Kent"),
- string16(),
- WebKit::WebInputElement::Text),
+ string16()),
&pair_id, &count));
EXPECT_EQ(0, count);
@@ -620,26 +612,22 @@ TEST_F(WebDatabaseTest, Autofill) {
EXPECT_TRUE(db.AddFormFieldValue(FormField(string16(),
ASCIIToUTF16("blank"),
string16(),
- string16(),
- WebKit::WebInputElement::Text),
+ string16()),
&changes));
EXPECT_TRUE(db.AddFormFieldValue(FormField(string16(),
ASCIIToUTF16("blank"),
ASCIIToUTF16(" "),
- string16(),
- WebKit::WebInputElement::Text),
+ string16()),
&changes));
EXPECT_TRUE(db.AddFormFieldValue(FormField(string16(),
ASCIIToUTF16("blank"),
ASCIIToUTF16(" "),
- string16(),
- WebKit::WebInputElement::Text),
+ string16()),
&changes));
EXPECT_TRUE(db.AddFormFieldValue(FormField(string16(),
ASCIIToUTF16("blank"),
kValue,
- string16(),
- WebKit::WebInputElement::Text),
+ string16()),
&changes));
// They should be stored normally as the DB layer does not check for empty
@@ -673,16 +661,14 @@ TEST_F(WebDatabaseTest, Autofill_RemoveBetweenChanges) {
FormField(string16(),
ASCIIToUTF16("Name"),
ASCIIToUTF16("Superman"),
- string16(),
- WebKit::WebInputElement::Text),
+ string16()),
&changes,
t1));
EXPECT_TRUE(db.AddFormFieldValueTime(
FormField(string16(),
ASCIIToUTF16("Name"),
ASCIIToUTF16("Superman"),
- string16(),
- WebKit::WebInputElement::Text),
+ string16()),
&changes,
t2));
@@ -716,8 +702,7 @@ TEST_F(WebDatabaseTest, Autofill_AddChanges) {
FormField(string16(),
ASCIIToUTF16("Name"),
ASCIIToUTF16("Superman"),
- string16(),
- WebKit::WebInputElement::Text),
+ string16()),
&changes,
t1));
ASSERT_EQ(1U, changes.size());
@@ -731,8 +716,7 @@ TEST_F(WebDatabaseTest, Autofill_AddChanges) {
FormField(string16(),
ASCIIToUTF16("Name"),
ASCIIToUTF16("Superman"),
- string16(),
- WebKit::WebInputElement::Text),
+ string16()),
&changes,
t2));
ASSERT_EQ(1U, changes.size());
@@ -754,8 +738,7 @@ TEST_F(WebDatabaseTest, Autofill_UpdateOneWithOneTimestamp) {
FormField field(string16(),
ASCIIToUTF16("foo"),
ASCIIToUTF16("bar"),
- string16(),
- WebKit::WebInputElement::Text);
+ string16());
int64 pair_id;
int count;
ASSERT_TRUE(db.GetIDAndCountOfFormElement(field, &pair_id, &count));
@@ -780,8 +763,7 @@ TEST_F(WebDatabaseTest, Autofill_UpdateOneWithTwoTimestamps) {
FormField field(string16(),
ASCIIToUTF16("foo"),
ASCIIToUTF16("bar"),
- string16(),
- WebKit::WebInputElement::Text);
+ string16());
int64 pair_id;
int count;
ASSERT_TRUE(db.GetIDAndCountOfFormElement(field, &pair_id, &count));
@@ -826,8 +808,7 @@ TEST_F(WebDatabaseTest, Autofill_UpdateTwo) {
FormField field0(string16(),
ASCIIToUTF16("foo"),
ASCIIToUTF16("bar0"),
- string16(),
- WebKit::WebInputElement::Text);
+ string16());
int64 pair_id;
int count;
ASSERT_TRUE(db.GetIDAndCountOfFormElement(field0, &pair_id, &count));
@@ -837,8 +818,7 @@ TEST_F(WebDatabaseTest, Autofill_UpdateTwo) {
FormField field1(string16(),
ASCIIToUTF16("foo"),
ASCIIToUTF16("bar1"),
- string16(),
- WebKit::WebInputElement::Text);
+ string16());
ASSERT_TRUE(db.GetIDAndCountOfFormElement(field1, &pair_id, &count));
EXPECT_LE(0, pair_id);
EXPECT_EQ(2, count);
@@ -854,8 +834,7 @@ TEST_F(WebDatabaseTest, Autofill_UpdateReplace) {
FormField(string16(),
ASCIIToUTF16("Name"),
ASCIIToUTF16("Superman"),
- string16(),
- WebKit::WebInputElement::Text),
+ string16()),
&changes));
AutofillEntry entry(MakeAutofillEntry("Name", "Superman", 1, 2));
@@ -883,8 +862,7 @@ TEST_F(WebDatabaseTest, Autofill_UpdateDontReplace) {
FormField(string16(),
existing.key().name(),
existing.key().value(),
- string16(),
- WebKit::WebInputElement::Text),
+ string16()),
&changes,
t));
AutofillEntry entry(MakeAutofillEntry("Name", "Clark Kent", 1, 2));
@@ -1253,8 +1231,7 @@ TEST_F(WebDatabaseTest, Autofill_GetAllAutofillEntries_OneResult) {
FormField(string16(),
ASCIIToUTF16("Name"),
ASCIIToUTF16("Superman"),
- string16(),
- WebKit::WebInputElement::Text),
+ string16()),
&changes,
Time::FromTimeT(start)));
timestamps1.push_back(Time::FromTimeT(start));
@@ -1297,8 +1274,7 @@ TEST_F(WebDatabaseTest, Autofill_GetAllAutofillEntries_TwoDistinct) {
FormField(string16(),
ASCIIToUTF16("Name"),
ASCIIToUTF16("Superman"),
- string16(),
- WebKit::WebInputElement::Text),
+ string16()),
&changes,
Time::FromTimeT(start)));
timestamps1.push_back(Time::FromTimeT(start));
@@ -1312,8 +1288,7 @@ TEST_F(WebDatabaseTest, Autofill_GetAllAutofillEntries_TwoDistinct) {
FormField(string16(),
ASCIIToUTF16("Name"),
ASCIIToUTF16("Clark Kent"),
- string16(),
- WebKit::WebInputElement::Text),
+ string16()),
&changes,
Time::FromTimeT(start)));
timestamps2.push_back(Time::FromTimeT(start));
@@ -1360,8 +1335,7 @@ TEST_F(WebDatabaseTest, Autofill_GetAllAutofillEntries_TwoSame) {
FormField(string16(),
ASCIIToUTF16("Name"),
ASCIIToUTF16("Superman"),
- string16(),
- WebKit::WebInputElement::Text),
+ string16()),
&changes,
Time::FromTimeT(start)));
timestamps.push_back(Time::FromTimeT(start));
generated by cgit v1.1 at 2025-03-10 21:22:58 +0000