summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/webdata/web_database_unittest.cc36
-rw-r--r--chrome/common/render_messages.h2
-rw-r--r--webkit/glue/form_field.cc9
-rw-r--r--webkit/glue/form_field.h12
-rw-r--r--webkit/glue/form_field_values.cc2
5 files changed, 18 insertions, 43 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
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index 5ce13c5..41486a0 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -756,7 +756,7 @@ struct ParamTraits<webkit_glue::FormFieldValues> {
string16 name, value;
result = result && ReadParam(m, iter, &name);
result = result && ReadParam(m, iter, &value);
- p->elements[i] = webkit_glue::FormField(NULL, name, value);
+ p->elements[i] = webkit_glue::FormField(name, value);
}
return result;
}
diff --git a/webkit/glue/form_field.cc b/webkit/glue/form_field.cc
index 76992f5..665f498 100644
--- a/webkit/glue/form_field.cc
+++ b/webkit/glue/form_field.cc
@@ -6,15 +6,12 @@
namespace webkit_glue {
-FormField::FormField()
- : element_(NULL) {
+FormField::FormField() {
}
-FormField::FormField(WebCore::HTMLFormControlElement* element,
- const string16& name,
+FormField::FormField(const string16& name,
const string16& value)
- : element_(element),
- name_(name),
+ : name_(name),
value_(value) {
}
diff --git a/webkit/glue/form_field.h b/webkit/glue/form_field.h
index 3871881..224934d 100644
--- a/webkit/glue/form_field.h
+++ b/webkit/glue/form_field.h
@@ -7,31 +7,21 @@
#include "base/string16.h"
-namespace WebCore {
-class HTMLFormControlElement;
-}
-
namespace webkit_glue {
// Stores information about a field in a form.
class FormField {
public:
FormField();
- FormField(WebCore::HTMLFormControlElement* element,
- const string16& name,
+ FormField(const string16& name,
const string16& value);
- WebCore::HTMLFormControlElement* element() const { return element_; }
string16 name() const { return name_; }
string16 value() const { return value_; }
- void set_element(WebCore::HTMLFormControlElement* element) {
- element_ = element;
- }
void set_value(const string16& value) { value_ = value; }
private:
- WebCore::HTMLFormControlElement* element_;
string16 name_;
string16 value_;
};
diff --git a/webkit/glue/form_field_values.cc b/webkit/glue/form_field_values.cc
index 3afdedd..eccb1ce6 100644
--- a/webkit/glue/form_field_values.cc
+++ b/webkit/glue/form_field_values.cc
@@ -69,7 +69,7 @@ FormFieldValues* FormFieldValues::Create(const WebForm& webform) {
if (name.length() == 0)
continue; // If we have no name, there is nothing to store.
- result->elements.push_back(FormField(form_element, name, value));
+ result->elements.push_back(FormField(name, value));
}
return result;
generated by cgit v1.1 at 2025-02-08 19:14:42 +0000