Revert 77296 -

Convert autofill messages to use the new IPC macros.  This requires
changing the FormField class to a struct with publically-visible members,
which was what should have been done in the first place, instead of the
trivial setters/getters which are accessed in various combinations 
independently of each other throughout the code.

Review URL: http://codereview.chromium.org/6633001

TBR=tsepez@chromium.org
Review URL: http://codereview.chromium.org/6623086

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

1 files changed, 35 insertions, 8 deletions

diff --git a/webkit/glue/form_field.h b/webkit/glue/form_field.h
index c246091..1874c44 100644
--- a/webkit/glue/form_field.h
+++ b/webkit/glue/form_field.h
@@ -13,7 +13,8 @@
 namespace webkit_glue {
 
 // Stores information about a field in a form.
-struct FormField {
+class FormField {
+ public:
   FormField();
   explicit FormField(WebKit::WebFormControlElement element);
   FormField(const string16& label,
@@ -24,6 +25,31 @@ struct FormField {
             bool is_autofilled);
   virtual ~FormField();
 
+  const string16& label() const { return label_; }
+  const string16& name() const { return name_; }
+  const string16& value() const { return value_; }
+  const string16& form_control_type() const { return form_control_type_; }
+  int max_length() const { return max_length_; }
+  bool is_autofilled() const { return is_autofilled_; }
+
+  // Returns option string for elements for which they make sense (select-one,
+  // for example) for the rest of elements return an empty array.
+  const std::vector<string16>& option_strings() const {
+    return option_strings_;
+  }
+
+  void set_label(const string16& label) { label_ = label; }
+  void set_name(const string16& name) { name_ = name; }
+  void set_value(const string16& value) { value_ = value; }
+  void set_form_control_type(const string16& form_control_type) {
+    form_control_type_ = form_control_type;
+  }
+  void set_max_length(int max_length) { max_length_ = max_length; }
+  void set_autofilled(bool is_autofilled) { is_autofilled_ = is_autofilled; }
+  void set_option_strings(const std::vector<string16>& strings) {
+    option_strings_ = strings;
+  }
+
   // Equality tests for identity which does not include |value_| or |size_|.
   // Use |StrictlyEqualsHack| method to test all members.
   // TODO(dhollowa): These operators need to be revised when we implement field
@@ -35,13 +61,14 @@ struct FormField {
   // TODO(dhollowa): This will be removed when we implement field ids.
   bool StrictlyEqualsHack(const FormField& field) const;
 
-  string16 label;
-  string16 name;
-  string16 value;
-  string16 form_control_type;
-  int max_length;
-  bool is_autofilled;
-  std::vector<string16> option_strings;
+ private:
+  string16 label_;
+  string16 name_;
+  string16 value_;
+  string16 form_control_type_;
+  int max_length_;
+  bool is_autofilled_;
+  std::vector<string16> option_strings_;
 };
 
 // So we can compare FormFields with EXPECT_EQ().