AutoFill: Refactor the code used to fill a form. Don't fill autocomplete=off

chrome/renderer/form_manager_unittest.cc

 // Copyright (c) 2010 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 "chrome/renderer/form_manager.h"
 #include "chrome/test/render_view_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebElement.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFormElement.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputElement.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebVector.h"
 #include "webkit/glue/form_data.h"
 
+using WebKit::WebDocument;
 using WebKit::WebElement;
 using WebKit::WebFormElement;
 using WebKit::WebFrame;
 using WebKit::WebInputElement;
 using WebKit::WebString;
 using WebKit::WebVector;
 
 using webkit_glue::FormData;
 using webkit_glue::FormField;
 
@@ skipping 304 matching lines @@
                       ASCIIToUTF16("Send"),
                       ASCIIToUTF16("submit"),
                       0),
             fields[2]);
 }
 
 TEST_F(FormManagerTest, FillForm) {
   LoadHTML("<FORM name=\"TestForm\" action=\"http://buh.com\" method=\"post\">"
            "  <INPUT type=\"text\" id=\"firstname\"/>"
            "  <INPUT type=\"text\" id=\"lastname\"/>"
+           "  <INPUT type=\"hidden\" id=\"imhidden\"/>"
+           "  <INPUT type=\"text\" id=\"notempty\" value=\"Hi\"/>"
+           "  <INPUT type=\"text\" autocomplete=\"off\" id=\"noautocomplete\"/>"
            "  <INPUT type=\"submit\" name=\"reply-send\" value=\"Send\"/>"
            "</FORM>");
 
   WebFrame* web_frame = GetMainFrame();
   ASSERT_NE(static_cast<WebFrame*>(NULL), web_frame);
 
   FormManager form_manager;
   form_manager.ExtractForms(web_frame);
 
   // Verify that we have the form.
   std::vector<FormData> forms;
   form_manager.GetForms(FormManager::REQUIRE_NONE, &forms);
   ASSERT_EQ(1U, forms.size());
 
   // Get the input element we want to find.
   WebElement element = web_frame->document().getElementById("firstname");
   WebInputElement input_element = element.to<WebInputElement>();
 
   // Find the form that contains the input element.
   FormData form;
   EXPECT_TRUE(form_manager.FindFormWithFormControlElement(
       input_element, FormManager::REQUIRE_NONE, &form));
   EXPECT_EQ(ASCIIToUTF16("TestForm"), form.name);
   EXPECT_EQ(GURL(web_frame->url()), form.origin);
   EXPECT_EQ(GURL("http://buh.com"), form.action);
 
   const std::vector<FormField>& fields = form.fields;
-  ASSERT_EQ(3U, fields.size());
+  ASSERT_EQ(6U, fields.size());
   EXPECT_EQ(FormField(string16(),
                       ASCIIToUTF16("firstname"),
                       string16(),
                       ASCIIToUTF16("text"),
                       20),
             fields[0]);
   EXPECT_EQ(FormField(string16(),
                       ASCIIToUTF16("lastname"),
                       string16(),
                       ASCIIToUTF16("text"),
                       20),
             fields[1]);
   EXPECT_EQ(FormField(string16(),
+                      ASCIIToUTF16("imhidden"),
+                      string16(),
+                      ASCIIToUTF16("hidden"),
+                      0),
+            fields[2]);
+  EXPECT_EQ(FormField(string16(),

[dhollowa, 2010/05/28 02:07:07]

These guys need the StrictlyEqualsHack() too I think.

[James Hawkins, 2010/05/28 02:17:27]

Not particularly, since they have no values at this point.  I only changed the
places where I also hand-checked the value().

+                      ASCIIToUTF16("notempty"),
+                      ASCIIToUTF16("Hi"),
+                      ASCIIToUTF16("text"),
+                      20),
+            fields[3]);
+  EXPECT_EQ(FormField(string16(),
+                      ASCIIToUTF16("noautocomplete"),
+                      string16(),
+                      ASCIIToUTF16("text"),
+                      20),
+            fields[4]);
+  EXPECT_EQ(FormField(string16(),
                       ASCIIToUTF16("reply-send"),
                       ASCIIToUTF16("Send"),
                       ASCIIToUTF16("submit"),
                       0),
-            fields[2]);
+            fields[5]);
 
   // Fill the form.
   form.fields[0].set_value(ASCIIToUTF16("Wyatt"));
   form.fields[1].set_value(ASCIIToUTF16("Earp"));
+  form.fields[2].set_value(ASCIIToUTF16("Alpha"));
+  form.fields[3].set_value(ASCIIToUTF16("Beta"));
+  form.fields[4].set_value(ASCIIToUTF16("Gamma"));
   EXPECT_TRUE(form_manager.FillForm(form));
 
-  // Find the newly-filled form that contains the input element.
-  FormData form2;
-  EXPECT_TRUE(form_manager.FindFormWithFormControlElement(
-      input_element, FormManager::REQUIRE_NONE, &form2));
-  EXPECT_EQ(ASCIIToUTF16("TestForm"), form2.name);
-  EXPECT_EQ(GURL(web_frame->url()), form2.origin);
-  EXPECT_EQ(GURL("http://buh.com"), form2.action);
+  // Verify the previewed elements.
+  WebDocument document = web_frame->document();
+  WebInputElement firstname =
+      document.getElementById("firstname").to<WebInputElement>();
+  // TODO(jhawkins): Check firstname.isAutofilled() once support has been added
+  // in WebKit.
+  EXPECT_EQ(ASCIIToUTF16("Wyatt"), firstname.value());
 
-  const std::vector<FormField>& fields2 = form2.fields;
-  ASSERT_EQ(3U, fields2.size());
-  EXPECT_EQ(FormField(string16(),
-                      ASCIIToUTF16("firstname"),
-                      ASCIIToUTF16("Wyatt"),
-                      ASCIIToUTF16("text"),
-                      20),
-            fields2[0]);
-  EXPECT_EQ(FormField(string16(),
-                      ASCIIToUTF16("lastname"),
-                      ASCIIToUTF16("Earp"),
-                      ASCIIToUTF16("text"),
-                      20),
-            fields2[1]);
-  EXPECT_EQ(FormField(string16(),
-                      ASCIIToUTF16("reply-send"),
-                      ASCIIToUTF16("Send"),
-                      ASCIIToUTF16("submit"),
-                      0),
-            fields2[2]);
+  WebInputElement lastname =
+      document.getElementById("lastname").to<WebInputElement>();
+  EXPECT_EQ(ASCIIToUTF16("Earp"), lastname.value());
+
+  // Hidden fields are not previewed.
+  WebInputElement imhidden =
+      document.getElementById("imhidden").to<WebInputElement>();
+  EXPECT_TRUE(imhidden.value().isEmpty());
+
+  // Non-empty fields are not previewed.
+  WebInputElement notempty =
+      document.getElementById("notempty").to<WebInputElement>();
+  EXPECT_EQ(ASCIIToUTF16("Hi"), notempty.value());
+
+  // autocomplete=off fields are not previewed.
+  WebInputElement noautocomplete =
+      document.getElementById("noautocomplete").to<WebInputElement>();
+  EXPECT_TRUE(noautocomplete.value().isEmpty());
 }
 
 TEST_F(FormManagerTest, Reset) {
   LoadHTML("<FORM name=\"TestForm\" action=\"http://cnn.com\" method=\"post\">"
            "  <INPUT type=\"text\" id=\"firstname\" value=\"John\"/>"
            "  <INPUT type=\"text\" id=\"lastname\" value=\"Smith\"/>"
            "  <INPUT type=\"submit\" name=\"reply-send\" value=\"Send\"/>"
            "</FORM>");
 
   WebFrame* web_frame = GetMainFrame();
@@ skipping 33 matching lines @@
   form_manager.GetForms(FormManager::REQUIRE_NONE, &forms);
   ASSERT_EQ(1U, forms.size());
 
   const FormData& form = forms[0];
   EXPECT_EQ(ASCIIToUTF16("TestForm"), form.name);
   EXPECT_EQ(GURL(web_frame->url()), form.origin);
   EXPECT_EQ(GURL("http://cnn.com"), form.action);
 
   const std::vector<FormField>& fields = form.fields;
   ASSERT_EQ(3U, fields.size());
-  EXPECT_EQ(FormField(ASCIIToUTF16("First name:"),
-                      ASCIIToUTF16("firstname"),
-                      ASCIIToUTF16("John"),
-                      ASCIIToUTF16("text"),
-                      20),
-            fields[0]);
-  EXPECT_EQ(FormField(ASCIIToUTF16("Last name:"),
-                      ASCIIToUTF16("lastname"),
-                      ASCIIToUTF16("Smith"),
-                      ASCIIToUTF16("text"),
-                      20),
-            fields[1]);
-  EXPECT_EQ(FormField(string16(),
-                      ASCIIToUTF16("reply-send"),
-                      ASCIIToUTF16("Send"),
-                      ASCIIToUTF16("submit"),
-                      0),
-            fields[2]);
+  EXPECT_TRUE(fields[0].StrictlyEqualsHack(
+      FormField(ASCIIToUTF16("First name:"),
+                ASCIIToUTF16("firstname"),
+                ASCIIToUTF16("John"),
+                ASCIIToUTF16("text"),
+                20)));
+  EXPECT_TRUE(fields[1].StrictlyEqualsHack(
+      FormField(ASCIIToUTF16("Last name:"),
+                ASCIIToUTF16("lastname"),
+                ASCIIToUTF16("Smith"),
+                ASCIIToUTF16("text"),
+                20)));
+  EXPECT_TRUE(fields[2].StrictlyEqualsHack(
+      FormField(string16(),
+                ASCIIToUTF16("reply-send"),
+                string16(),
+                ASCIIToUTF16("submit"),
+                0)));
 }
 
 TEST_F(FormManagerTest, LabelsWithSpans) {
   LoadHTML("<FORM name=\"TestForm\" action=\"http://cnn.com\" method=\"post\">"
            "  <LABEL for=\"firstname\"><span>First name: </span></LABEL>"
            "    <INPUT type=\"text\" id=\"firstname\" value=\"John\"/>"
            "  <LABEL for=\"lastname\"><span>Last name: </span></LABEL>"
            "    <INPUT type=\"text\" id=\"lastname\" value=\"Smith\"/>"
            "  <INPUT type=\"submit\" name=\"reply-send\" value=\"Send\"/>"
            "</FORM>");
 
   WebFrame* web_frame = GetMainFrame();
   ASSERT_NE(static_cast<WebFrame*>(NULL), web_frame);
 
   FormManager form_manager;
   form_manager.ExtractForms(web_frame);
 
   std::vector<FormData> forms;
   form_manager.GetForms(FormManager::REQUIRE_NONE, &forms);
   ASSERT_EQ(1U, forms.size());
 
   const FormData& form = forms[0];
   EXPECT_EQ(ASCIIToUTF16("TestForm"), form.name);
   EXPECT_EQ(GURL(web_frame->url()), form.origin);
   EXPECT_EQ(GURL("http://cnn.com"), form.action);
 
   const std::vector<FormField>& fields = form.fields;
   ASSERT_EQ(3U, fields.size());
-  EXPECT_EQ(FormField(ASCIIToUTF16("First name:"),
-                      ASCIIToUTF16("firstname"),
-                      ASCIIToUTF16("John"),
-                      ASCIIToUTF16("text"),
-                      20),
-            fields[0]);
-  EXPECT_EQ(FormField(ASCIIToUTF16("Last name:"),
-                      ASCIIToUTF16("lastname"),
-                      ASCIIToUTF16("Smith"),
-                      ASCIIToUTF16("text"),
-                      20),
-            fields[1]);
-  EXPECT_EQ(FormField(string16(),
-                      ASCIIToUTF16("reply-send"),
-                      ASCIIToUTF16("Send"),
-                      ASCIIToUTF16("submit"),
-                      0),
-            fields[2]);
+  EXPECT_TRUE(fields[0].StrictlyEqualsHack(
+      FormField(ASCIIToUTF16("First name:"),
+                ASCIIToUTF16("firstname"),
+                ASCIIToUTF16("John"),
+                ASCIIToUTF16("text"),
+                20)));
+  EXPECT_TRUE(fields[1].StrictlyEqualsHack(
+      FormField(ASCIIToUTF16("Last name:"),
+                ASCIIToUTF16("lastname"),
+                ASCIIToUTF16("Smith"),
+                ASCIIToUTF16("text"),
+                20)));
+  EXPECT_TRUE(fields[2].StrictlyEqualsHack(
+      FormField(string16(),
+                ASCIIToUTF16("reply-send"),
+                string16(),
+                ASCIIToUTF16("submit"),
+                0)));
 }
 
 // This test is different from FormManagerTest.Labels in that the label elements
 // for= attribute is set to the name of the form control element it is a label
 // for instead of the id of the form control element.  This is invalid because
 // the for= attribute must be set to the id of the form control element.
 TEST_F(FormManagerTest, InvalidLabels) {
   LoadHTML("<FORM name=\"TestForm\" action=\"http://cnn.com\" method=\"post\">"
            "  <LABEL for=\"firstname\"> First name: </LABEL>"
            "    <INPUT type=\"text\" name=\"firstname\" value=\"John\"/>"
@@ skipping 12 matching lines @@
   form_manager.GetForms(FormManager::REQUIRE_NONE, &forms);
   ASSERT_EQ(1U, forms.size());
 
   const FormData& form = forms[0];
   EXPECT_EQ(ASCIIToUTF16("TestForm"), form.name);
   EXPECT_EQ(GURL(web_frame->url()), form.origin);
   EXPECT_EQ(GURL("http://cnn.com"), form.action);
 
   const std::vector<FormField>& fields = form.fields;
   ASSERT_EQ(3U, fields.size());
-  EXPECT_EQ(FormField(string16(),
-                      ASCIIToUTF16("firstname"),
-                      ASCIIToUTF16("John"),
-                      ASCIIToUTF16("text"),
-                      20),
-            fields[0]);
-  EXPECT_EQ(FormField(string16(),
-                      ASCIIToUTF16("lastname"),
-                      ASCIIToUTF16("Smith"),
-                      ASCIIToUTF16("text"),
-                      20),
-            fields[1]);
-  EXPECT_EQ(FormField(string16(),
-                      ASCIIToUTF16("reply-send"),
-                      ASCIIToUTF16("Send"),
-                      ASCIIToUTF16("submit"),
-                      0),
-            fields[2]);
+  EXPECT_TRUE(fields[0].StrictlyEqualsHack(FormField(string16(),
+                                           ASCIIToUTF16("firstname"),
+                                           ASCIIToUTF16("John"),
+                                           ASCIIToUTF16("text"),
+                                           20)));
+  EXPECT_TRUE(fields[1].StrictlyEqualsHack(FormField(string16(),
+                                           ASCIIToUTF16("lastname"),
+                                           ASCIIToUTF16("Smith"),
+                                           ASCIIToUTF16("text"),
+                                           20)));
+  EXPECT_TRUE(fields[2].StrictlyEqualsHack(FormField(string16(),
+                                           ASCIIToUTF16("reply-send"),
+                                           string16(),
+                                           ASCIIToUTF16("submit"),
+                                           0)));
 }
 
 // This test has three form control elements, only one of which has a label
 // element associated with it.  The first element is disabled because of the
 // autocomplete=off attribute.
 TEST_F(FormManagerTest, OneLabelElementFirstControlElementDisabled) {
   LoadHTML("<FORM name=\"TestForm\" action=\"http://cnn.com\" method=\"post\">"
            "  First name:"
            "    <INPUT type=\"text\" id=\"firstname\" autocomplete=\"off\"/>"
            "  <LABEL for=\"middlename\">Middle name: </LABEL>"
@@ skipping 515 matching lines @@
   EXPECT_TRUE(form_manager.FillForm(form));
 
   // Find the newly-filled form that contains the input element.
   FormData form2;
   EXPECT_TRUE(form_manager.FindFormWithFormControlElement(
       input_element, FormManager::REQUIRE_NONE, &form2));
   EXPECT_EQ(ASCIIToUTF16("TestForm"), form2.name);
   EXPECT_EQ(GURL(web_frame->url()), form2.origin);
   EXPECT_EQ(GURL("http://buh.com"), form2.action);
 
-  // TODO(jhawkins): We don't actually compare the value of the field in
-  // FormField::operator==()!
   const std::vector<FormField>& fields2 = form2.fields;
-  EXPECT_EQ(FormField(string16(),
-                      ASCIIToUTF16("firstname"),
-                      ASCIIToUTF16("Broth"),
-                      ASCIIToUTF16("text"),
-                      20),
-                      fields2[0]);
-  EXPECT_EQ(ASCIIToUTF16("Broth"), fields2[0].value());
-  EXPECT_EQ(FormField(string16(),
-                      ASCIIToUTF16("lastname"),
-                      ASCIIToUTF16("Jonat"),
-                      ASCIIToUTF16("text"),
-                      20),
-                      fields2[1]);
-  EXPECT_EQ(ASCIIToUTF16("Jonat"), fields2[1].value());
-  EXPECT_EQ(FormField(string16(),
-                      ASCIIToUTF16("reply-send"),
-                      ASCIIToUTF16("Send"),
-                      ASCIIToUTF16("submit"),
-                      0),
-                      fields2[2]);
+  EXPECT_TRUE(fields2[0].StrictlyEqualsHack(
+      FormField(string16(),
+                ASCIIToUTF16("firstname"),
+                ASCIIToUTF16("Broth"),
+                ASCIIToUTF16("text"),
+                20)));
+  EXPECT_TRUE(fields2[1].StrictlyEqualsHack(
+      FormField(string16(),
+                ASCIIToUTF16("lastname"),
+                ASCIIToUTF16("Jonat"),
+                ASCIIToUTF16("text"),
+                20)));
+  EXPECT_TRUE(fields2[2].StrictlyEqualsHack(
+      FormField(string16(),
+                ASCIIToUTF16("reply-send"),
+                string16(),
+                ASCIIToUTF16("submit"),
+                0)));
 }
 
 // This test uses negative values of the maxlength attribute for input elements.
 // In this case, the maxlength of the input elements is set to the default
 // maxlength (defined in WebKit.)
 TEST_F(FormManagerTest, FillFormNegativeMaxLength) {
   LoadHTML("<FORM name=\"TestForm\" action=\"http://buh.com\" method=\"post\">"
            "  <INPUT type=\"text\" id=\"firstname\" maxlength=\"-1\"/>"
            "  <INPUT type=\"text\" id=\"lastname\" maxlength=\"-10\"/>"
            "  <INPUT type=\"submit\" name=\"reply-send\" value=\"Send\"/>"
@@ skipping 49 matching lines @@
   EXPECT_TRUE(form_manager.FillForm(form));
 
   // Find the newly-filled form that contains the input element.
   FormData form2;
   EXPECT_TRUE(form_manager.FindFormWithFormControlElement(
       input_element, FormManager::REQUIRE_NONE, &form2));
   EXPECT_EQ(ASCIIToUTF16("TestForm"), form2.name);
   EXPECT_EQ(GURL(web_frame->url()), form2.origin);
   EXPECT_EQ(GURL("http://buh.com"), form2.action);
 
-  // TODO(jhawkins): We don't actually compare the value of the field in
-  // FormField::operator==()!
   const std::vector<FormField>& fields2 = form2.fields;
   ASSERT_EQ(3U, fields2.size());
-  EXPECT_EQ(FormField(string16(),
-                      ASCIIToUTF16("firstname"),
-                      ASCIIToUTF16("Brother"),
-                      ASCIIToUTF16("text"),
-                      20),
-                      fields2[0]);
-  EXPECT_EQ(ASCIIToUTF16("Brother"), fields2[0].value());
-  EXPECT_EQ(FormField(string16(),
-                      ASCIIToUTF16("lastname"),
-                      ASCIIToUTF16("Jonathan"),
-                      ASCIIToUTF16("text"),
-                      20),
-                      fields2[1]);
-  EXPECT_EQ(ASCIIToUTF16("Jonathan"), fields2[1].value());
-  EXPECT_EQ(FormField(string16(),
-                      ASCIIToUTF16("reply-send"),
-                      ASCIIToUTF16("Send"),
-                      ASCIIToUTF16("submit"),
-                      0),
-                      fields2[2]);
+  EXPECT_TRUE(fields2[0].StrictlyEqualsHack(
+      FormField(string16(),
+                ASCIIToUTF16("firstname"),
+                ASCIIToUTF16("Brother"),
+                ASCIIToUTF16("text"),
+                20)));
+  EXPECT_TRUE(fields2[1].StrictlyEqualsHack(
+      FormField(string16(),
+                ASCIIToUTF16("lastname"),
+                ASCIIToUTF16("Jonathan"),
+                ASCIIToUTF16("text"),
+                20)));
+  EXPECT_TRUE(fields2[2].StrictlyEqualsHack(
+      FormField(string16(),
+                ASCIIToUTF16("reply-send"),
+                string16(),
+                ASCIIToUTF16("submit"),
+                0)));
 }
 
 // This test sends a FormData object to FillForm with more fields than are in
 // the cached WebFormElement.  In this case, we only fill out the fields that
 // match between the FormData object and the WebFormElement.
 TEST_F(FormManagerTest, FillFormMoreFormDataFields) {
   LoadHTML("<FORM name=\"TestForm\" action=\"http://buh.com\" method=\"post\">"
            "  <INPUT type=\"text\" id=\"firstname\"/>"
            "  <INPUT type=\"text\" id=\"middlename\"/>"
            "  <INPUT type=\"text\" id=\"lastname\"/>"
@@ skipping 64 matching lines @@
   WebInputElement input_element = element.to<WebInputElement>();
 
   // Find the newly-filled form that contains the input element.
   FormData form2;
   EXPECT_TRUE(form_manager.FindFormWithFormControlElement(
       input_element, FormManager::REQUIRE_NONE, &form2));
   EXPECT_EQ(ASCIIToUTF16("TestForm"), form2.name);
   EXPECT_EQ(GURL(web_frame->url()), form2.origin);
   EXPECT_EQ(GURL("http://buh.com"), form2.action);
 
-  // TODO(jhawkins): We don't actually compare the value of the field in
-  // FormField::operator==()!
   const std::vector<FormField>& fields = form2.fields;
   ASSERT_EQ(4U, fields.size());
-  EXPECT_EQ(FormField(string16(),
-                      ASCIIToUTF16("firstname"),
-                      ASCIIToUTF16("Brother"),
-                      ASCIIToUTF16("text"),
-                      20),
-            fields[0]);
-  EXPECT_EQ(ASCIIToUTF16("Brother"), fields[0].value());
-  EXPECT_EQ(FormField(string16(),
-                      ASCIIToUTF16("middlename"),
-                      ASCIIToUTF16("Joseph"),
-                      ASCIIToUTF16("text"),
-                      20),
-            fields[1]);
-  EXPECT_EQ(ASCIIToUTF16("Joseph"), fields[1].value());
-  EXPECT_EQ(FormField(string16(),
-                      ASCIIToUTF16("lastname"),
-                      ASCIIToUTF16("Jonathan"),
-                      ASCIIToUTF16("text"),
-                      20),
-            fields[2]);
-  EXPECT_EQ(ASCIIToUTF16("Jonathan"), fields[2].value());
-  EXPECT_EQ(FormField(string16(),
-                      ASCIIToUTF16("reply-send"),
-                      ASCIIToUTF16("Send"),
-                      ASCIIToUTF16("submit"),
-                      0),
-            fields[3]);
+  EXPECT_TRUE(fields[0].StrictlyEqualsHack(FormField(string16(),
+                                                     ASCIIToUTF16("firstname"),
+                                                     ASCIIToUTF16("Brother"),
+                                                     ASCIIToUTF16("text"),
+                                                     20)));
+  EXPECT_TRUE(fields[1].StrictlyEqualsHack(FormField(string16(),
+                                                     ASCIIToUTF16("middlename"),
+                                                     ASCIIToUTF16("Joseph"),
+                                                     ASCIIToUTF16("text"),
+                                                     20)));
+  EXPECT_TRUE(fields[2].StrictlyEqualsHack(FormField(string16(),
+                                                     ASCIIToUTF16("lastname"),
+                                                     ASCIIToUTF16("Jonathan"),
+                                                     ASCIIToUTF16("text"),
+                                                     20)));
+  EXPECT_TRUE(fields[3].StrictlyEqualsHack(FormField(string16(),
+                                                     ASCIIToUTF16("reply-send"),
+                                                     string16(),
+                                                     ASCIIToUTF16("submit"),
+                                                     0)));
 }
 
 // This test sends a FormData object to FillForm with fewer fields than are in
 // the cached WebFormElement.  In this case, we only fill out the fields that
 // match between the FormData object and the WebFormElement.
 TEST_F(FormManagerTest, FillFormFewerFormDataFields) {
   LoadHTML("<FORM name=\"TestForm\" action=\"http://buh.com\" method=\"post\">"
            "  <INPUT type=\"text\" id=\"prefix\"/>"
            "  <INPUT type=\"text\" id=\"firstname\"/>"
            "  <INPUT type=\"text\" id=\"hidden\"/>"
@@ skipping 36 matching lines @@
   WebInputElement input_element = element.to<WebInputElement>();
 
   // Find the newly-filled form that contains the input element.
   FormData form2;
   EXPECT_TRUE(form_manager.FindFormWithFormControlElement(
       input_element, FormManager::REQUIRE_NONE, &form2));
   EXPECT_EQ(ASCIIToUTF16("TestForm"), form2.name);
   EXPECT_EQ(GURL(web_frame->url()), form2.origin);
   EXPECT_EQ(GURL("http://buh.com"), form2.action);
 
-  // TODO(jhawkins): We don't actually compare the value of the field in
-  // FormField::operator==()!
   const std::vector<FormField>& fields = form2.fields;
   ASSERT_EQ(8U, fields.size());
-  EXPECT_EQ(FormField(string16(),
-                      ASCIIToUTF16("prefix"),
-                      string16(),
-                      ASCIIToUTF16("text"),
-                      20),
-            fields[0]);
-  EXPECT_EQ(string16(), fields[0].value());
-  EXPECT_EQ(FormField(string16(),
-                      ASCIIToUTF16("firstname"),
-                      ASCIIToUTF16("Brother"),
-                      ASCIIToUTF16("text"),
-                      20),
-            fields[1]);
-  EXPECT_EQ(ASCIIToUTF16("Brother"), fields[1].value());
-  EXPECT_EQ(FormField(string16(),
-                      ASCIIToUTF16("hidden"),
-                      string16(),
-                      ASCIIToUTF16("text"),
-                      20),
-            fields[2]);
-  EXPECT_EQ(string16(), fields[2].value());
-  EXPECT_EQ(FormField(string16(),
-                      ASCIIToUTF16("middlename"),
-                      ASCIIToUTF16("Joseph"),
-                      ASCIIToUTF16("text"),
-                      20),
-            fields[3]);
-  EXPECT_EQ(ASCIIToUTF16("Joseph"), fields[3].value());
-  EXPECT_EQ(FormField(string16(),
-                      ASCIIToUTF16("second"),
-                      string16(),
-                      ASCIIToUTF16("text"),
-                      20),
-            fields[4]);
-  EXPECT_EQ(string16(), fields[4].value());
-  EXPECT_EQ(FormField(string16(),
-                      ASCIIToUTF16("lastname"),
-                      ASCIIToUTF16("Jonathan"),
-                      ASCIIToUTF16("text"),
-                      20),
-            fields[5]);
-  EXPECT_EQ(ASCIIToUTF16("Jonathan"), fields[5].value());
-  EXPECT_EQ(FormField(string16(),
-                      ASCIIToUTF16("postfix"),
-                      string16(),
-                      ASCIIToUTF16("text"),
-                      20),
-            fields[6]);
-  EXPECT_EQ(string16(), fields[6].value());
-  EXPECT_EQ(FormField(string16(),
-                      ASCIIToUTF16("reply-send"),
-                      ASCIIToUTF16("Send"),
-                      ASCIIToUTF16("submit"),
-                      0),
-            fields[7]);
+  EXPECT_TRUE(fields[0].StrictlyEqualsHack(FormField(string16(),
+                                                     ASCIIToUTF16("prefix"),
+                                                     string16(),
+                                                     ASCIIToUTF16("text"),
+                                                     20)));
+  EXPECT_TRUE(fields[1].StrictlyEqualsHack(FormField(string16(),
+                                                     ASCIIToUTF16("firstname"),
+                                                     ASCIIToUTF16("Brother"),
+                                                     ASCIIToUTF16("text"),
+                                                     20)));
+  EXPECT_TRUE(fields[2].StrictlyEqualsHack(FormField(string16(),
+                                                     ASCIIToUTF16("hidden"),
+                                                     string16(),
+                                                     ASCIIToUTF16("text"),
+                                                     20)));
+  EXPECT_TRUE(fields[3].StrictlyEqualsHack(FormField(string16(),
+                                                     ASCIIToUTF16("middlename"),
+                                                     ASCIIToUTF16("Joseph"),
+                                                     ASCIIToUTF16("text"),
+                                                     20)));
+  EXPECT_TRUE(fields[4].StrictlyEqualsHack(FormField(string16(),
+                                                     ASCIIToUTF16("second"),
+                                                     string16(),
+                                                     ASCIIToUTF16("text"),
+                                                     20)));
+  EXPECT_TRUE(fields[5].StrictlyEqualsHack(FormField(string16(),
+                                                     ASCIIToUTF16("lastname"),
+                                                     ASCIIToUTF16("Jonathan"),
+                                                     ASCIIToUTF16("text"),
+                                                     20)));
+  EXPECT_TRUE(fields[6].StrictlyEqualsHack(FormField(string16(),
+                                                     ASCIIToUTF16("postfix"),
+                                                     string16(),
+                                                     ASCIIToUTF16("text"),
+                                                     20)));
+  EXPECT_TRUE(fields[7].StrictlyEqualsHack(FormField(string16(),
+                                                     ASCIIToUTF16("reply-send"),
+                                                     string16(),
+                                                     ASCIIToUTF16("submit"),
+                                                     0)));
 }
 
 // This test sends a FormData object to FillForm with a field changed from
 // those in the cached WebFormElement.  In this case, we only fill out the
 // fields that match between the FormData object and the WebFormElement.
 TEST_F(FormManagerTest, FillFormChangedFormDataFields) {
   LoadHTML("<FORM name=\"TestForm\" action=\"http://buh.com\" method=\"post\">"
            "  <INPUT type=\"text\" id=\"firstname\"/>"
            "  <INPUT type=\"text\" id=\"middlename\"/>"
            "  <INPUT type=\"text\" id=\"lastname\"/>"
@@ skipping 33 matching lines @@
   WebInputElement input_element = element.to<WebInputElement>();
 
   // Find the newly-filled form that contains the input element.
   FormData form2;
   EXPECT_TRUE(form_manager.FindFormWithFormControlElement(
       input_element, FormManager::REQUIRE_NONE, &form2));
   EXPECT_EQ(ASCIIToUTF16("TestForm"), form2.name);
   EXPECT_EQ(GURL(web_frame->url()), form2.origin);
   EXPECT_EQ(GURL("http://buh.com"), form2.action);
 
-  // TODO(jhawkins): We don't actually compare the value of the field in
-  // FormField::operator==()!
   const std::vector<FormField>& fields = form2.fields;
   ASSERT_EQ(4U, fields.size());
-  EXPECT_EQ(FormField(string16(),
-                      ASCIIToUTF16("firstname"),
-                      ASCIIToUTF16("Brother"),
-                      ASCIIToUTF16("text"),
-                      20),
-            fields[0]);
-  EXPECT_EQ(ASCIIToUTF16("Brother"), fields[0].value());
-  EXPECT_EQ(FormField(string16(),
-                      ASCIIToUTF16("middlename"),
-                      ASCIIToUTF16("Joseph"),
-                      ASCIIToUTF16("text"),
-                      20),
-            fields[1]);
-  EXPECT_EQ(string16(), fields[1].value());
-  EXPECT_EQ(FormField(string16(),
-                      ASCIIToUTF16("lastname"),
-                      ASCIIToUTF16("Jonathan"),
-                      ASCIIToUTF16("text"),
-                      20),
-            fields[2]);
-  EXPECT_EQ(ASCIIToUTF16("Jonathan"), fields[2].value());
-  EXPECT_EQ(FormField(string16(),
-                      ASCIIToUTF16("reply-send"),
-                      ASCIIToUTF16("Send"),
-                      ASCIIToUTF16("submit"),
-                      0),
-            fields[3]);
+  EXPECT_TRUE(fields[0].StrictlyEqualsHack(FormField(string16(),
+                                           ASCIIToUTF16("firstname"),
+                                           ASCIIToUTF16("Brother"),
+                                           ASCIIToUTF16("text"),
+                                           20)));
+  EXPECT_TRUE(fields[1].StrictlyEqualsHack(FormField(string16(),
+                                           ASCIIToUTF16("middlename"),
+                                           string16(),
+                                           ASCIIToUTF16("text"),
+                                           20)));
+  EXPECT_TRUE(fields[2].StrictlyEqualsHack(FormField(string16(),
+                                           ASCIIToUTF16("lastname"),
+                                           ASCIIToUTF16("Jonathan"),
+                                           ASCIIToUTF16("text"),
+                                           20)));
+  EXPECT_TRUE(fields[3].StrictlyEqualsHack(FormField(string16(),
+                                           ASCIIToUTF16("reply-send"),
+                                           string16(),
+                                           ASCIIToUTF16("submit"),
+                                           0)));
 }
 
 // This test sends a FormData object to FillForm with fewer fields than are in
 // the cached WebFormElement.  In this case, we only fill out the fields that
 // match between the FormData object and the WebFormElement.
 TEST_F(FormManagerTest, FillFormExtraFieldInCache) {
   LoadHTML("<FORM name=\"TestForm\" action=\"http://buh.com\" method=\"post\">"
            "  <INPUT type=\"text\" id=\"firstname\"/>"
            "  <INPUT type=\"text\" id=\"middlename\"/>"
            "  <INPUT type=\"text\" id=\"lastname\"/>"
@@ skipping 30 matching lines @@
   WebInputElement input_element = element.to<WebInputElement>();
 
   // Find the newly-filled form that contains the input element.
   FormData form2;
   EXPECT_TRUE(form_manager.FindFormWithFormControlElement(
       input_element, FormManager::REQUIRE_NONE, &form2));
   EXPECT_EQ(ASCIIToUTF16("TestForm"), form2.name);
   EXPECT_EQ(GURL(web_frame->url()), form2.origin);
   EXPECT_EQ(GURL("http://buh.com"), form2.action);
 
-  // TODO(jhawkins): We don't actually compare the value of the field in
-  // FormField::operator==()!
   const std::vector<FormField>& fields = form2.fields;
   ASSERT_EQ(5U, fields.size());
-  EXPECT_EQ(FormField(string16(),
-                      ASCIIToUTF16("firstname"),
-                      ASCIIToUTF16("Brother"),
-                      ASCIIToUTF16("text"),
-                      20),
-            fields[0]);
-  EXPECT_EQ(ASCIIToUTF16("Brother"), fields[0].value());
-  EXPECT_EQ(FormField(string16(),
-                      ASCIIToUTF16("middlename"),
-                      ASCIIToUTF16("Joseph"),
-                      ASCIIToUTF16("text"),
-                      20),
-            fields[1]);
-  EXPECT_EQ(ASCIIToUTF16("Joseph"), fields[1].value());
-  EXPECT_EQ(FormField(string16(),
-                      ASCIIToUTF16("lastname"),
-                      ASCIIToUTF16("Jonathan"),
-                      ASCIIToUTF16("text"),
-                      20),
-            fields[2]);
-  EXPECT_EQ(ASCIIToUTF16("Jonathan"), fields[2].value());
-  EXPECT_EQ(FormField(string16(),
-                      ASCIIToUTF16("postfix"),
-                      string16(),
-                      ASCIIToUTF16("text"),
-                      20),
-            fields[3]);
-  EXPECT_EQ(string16(), fields[3].value());
-  EXPECT_EQ(FormField(string16(),
-                      ASCIIToUTF16("reply-send"),
-                      ASCIIToUTF16("Send"),
-                      ASCIIToUTF16("submit"),
-                      0),
-            fields[4]);
+  EXPECT_TRUE(fields[0].StrictlyEqualsHack(FormField(string16(),
+                                                     ASCIIToUTF16("firstname"),
+                                                     ASCIIToUTF16("Brother"),
+                                                     ASCIIToUTF16("text"),
+                                                     20)));
+  EXPECT_TRUE(fields[1].StrictlyEqualsHack(FormField(string16(),
+                                                     ASCIIToUTF16("middlename"),
+                                                     ASCIIToUTF16("Joseph"),
+                                                     ASCIIToUTF16("text"),
+                                                     20)));
+  EXPECT_TRUE(fields[2].StrictlyEqualsHack(FormField(string16(),
+                                                     ASCIIToUTF16("lastname"),
+                                                     ASCIIToUTF16("Jonathan"),
+                                                     ASCIIToUTF16("text"),
+                                                     20)));
+  EXPECT_TRUE(fields[3].StrictlyEqualsHack(FormField(string16(),
+                                                     ASCIIToUTF16("postfix"),
+                                                     string16(),
+                                                     ASCIIToUTF16("text"),
+                                                     20)));
+  EXPECT_TRUE(fields[4].StrictlyEqualsHack(FormField(string16(),
+                                                     ASCIIToUTF16("reply-send"),
+                                                     string16(),
+                                                     ASCIIToUTF16("submit"),
+                                                     0)));
 }
 
 TEST_F(FormManagerTest, FillFormEmptyName) {
   LoadHTML("<FORM name=\"TestForm\" action=\"http://buh.com\" method=\"post\">"
            "  <INPUT type=\"text\" id=\"firstname\"/>"
            "  <INPUT type=\"text\" id=\"lastname\"/>"
            "  <INPUT type=\"submit\" value=\"Send\"/>"
            "</FORM>");
 
   WebFrame* web_frame = GetMainFrame();
@@ skipping 306 matching lines @@
             fields[5]);
   EXPECT_EQ(FormField(string16(),
                       ASCIIToUTF16("reply-send"),
                       ASCIIToUTF16("Send"),
                       ASCIIToUTF16("submit"),
                       0),
             fields[6]);
 }
 
 }  // namespace