Convert autofill messages to use the new IPC macros

chrome/renderer/autofill/form_manager_browsertest.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 <vector>
 
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/renderer/autofill/form_manager.h"
@@ skipping 231 matching lines @@
   FormField result3;
   FormManager::WebFormControlElementToFormField(element,
                                                 FormManager::EXTRACT_OPTIONS,
                                                 &result3);
   EXPECT_TRUE(result3.StrictlyEqualsHack(FormField(string16(),
                                                    ASCIIToUTF16("element"),
                                                    string16(),
                                                    ASCIIToUTF16("select-one"),
                                                    0,
                                                    false)));
-  ASSERT_EQ(2U, result3.option_strings().size());
-  EXPECT_EQ(ASCIIToUTF16("CA"), result3.option_strings()[0]);
-  EXPECT_EQ(ASCIIToUTF16("TX"), result3.option_strings()[1]);
+  ASSERT_EQ(2U, result3.option_strings.size());
+  EXPECT_EQ(ASCIIToUTF16("CA"), result3.option_strings[0]);
+  EXPECT_EQ(ASCIIToUTF16("TX"), result3.option_strings[1]);
 }
 
 // We should be not extract the value for non-text and non-select fields.
 TEST_F(FormManagerTest, WebFormControlElementToFormFieldInvalidType) {
   LoadHTML("<FORM name=\"TestForm\" action=\"http://cnn.com\" method=\"post\">"
            "  <INPUT type=\"hidden\" id=\"hidden\" value=\"apple\"/>"
            "  <INPUT type=\"password\" id=\"password\" value=\"secret\"/>"
            "  <INPUT type=\"checkbox\" id=\"checkbox\" value=\"mail\"/>"
            "  <INPUT type=\"radio\" id=\"radio\" value=\"male\"/>"
            "  <INPUT type=\"submit\" id=\"submit\" value=\"Send\"/>"
@@ skipping 521 matching lines @@
             fields[3]);
   EXPECT_EQ(FormField(string16(),
                       ASCIIToUTF16("notenabled"),
                       string16(),
                       ASCIIToUTF16("text"),
                       WebInputElement::defaultMaxLength(),
                       false),
             fields[4]);
 
   // 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"));
+  form.fields[0].value = ASCIIToUTF16("Wyatt");
+  form.fields[1].value = ASCIIToUTF16("Earp");
+  form.fields[2].value = ASCIIToUTF16("Alpha");
+  form.fields[3].value = ASCIIToUTF16("Beta");
+  form.fields[4].value = ASCIIToUTF16("Gamma");
   EXPECT_TRUE(form_manager.FillForm(form, input_element));
 
   // Verify the filled elements.
   WebDocument document = web_frame->document();
   WebInputElement firstname =
       document.getElementById("firstname").to<WebInputElement>();
   EXPECT_TRUE(firstname.isAutofilled());
   EXPECT_EQ(ASCIIToUTF16("Wyatt"), firstname.value());
   EXPECT_EQ(5, firstname.selectionStart());
   EXPECT_EQ(5, firstname.selectionEnd());
@@ skipping 87 matching lines @@
             fields[3]);
   EXPECT_EQ(FormField(string16(),
                       ASCIIToUTF16("notenabled"),
                       string16(),
                       ASCIIToUTF16("text"),
                       WebInputElement::defaultMaxLength(),
                       false),
             fields[4]);
 
   // Preview 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"));
+  form.fields[0].value = ASCIIToUTF16("Wyatt");
+  form.fields[1].value = ASCIIToUTF16("Earp");
+  form.fields[2].value = ASCIIToUTF16("Alpha");
+  form.fields[3].value = ASCIIToUTF16("Beta");
+  form.fields[4].value = ASCIIToUTF16("Gamma");
   EXPECT_TRUE(form_manager.PreviewForm(form, input_element));
 
   // Verify the previewed elements.
   WebDocument document = web_frame->document();
   WebInputElement firstname =
       document.getElementById("firstname").to<WebInputElement>();
   EXPECT_TRUE(firstname.isAutofilled());
   EXPECT_EQ(ASCIIToUTF16("Wyatt"), firstname.suggestedValue());
   EXPECT_EQ(0, firstname.selectionStart());
   EXPECT_EQ(5, firstname.selectionEnd());
@@ skipping 554 matching lines @@
             fields[1]);
   EXPECT_EQ(FormField(string16(),
                       ASCIIToUTF16("email"),
                       string16(),
                       ASCIIToUTF16("text"),
                       9,
                       false),
             fields[2]);
 
   // Fill the form.
-  form.fields[0].set_value(ASCIIToUTF16("Brother"));
-  form.fields[1].set_value(ASCIIToUTF16("Jonathan"));
-  form.fields[2].set_value(ASCIIToUTF16("brotherj@example.com"));
+  form.fields[0].value = ASCIIToUTF16("Brother");
+  form.fields[1].value = ASCIIToUTF16("Jonathan");
+  form.fields[2].value = ASCIIToUTF16("brotherj@example.com");
   EXPECT_TRUE(form_manager.FillForm(form, WebNode()));
 
   // 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);
 
@@ skipping 71 matching lines @@
             fields[1]);
   EXPECT_EQ(FormField(string16(),
                       ASCIIToUTF16("email"),
                       string16(),
                       ASCIIToUTF16("text"),
                       WebInputElement::defaultMaxLength(),
                       false),
             fields[2]);
 
   // Fill the form.
-  form.fields[0].set_value(ASCIIToUTF16("Brother"));
-  form.fields[1].set_value(ASCIIToUTF16("Jonathan"));
-  form.fields[2].set_value(ASCIIToUTF16("brotherj@example.com"));
+  form.fields[0].value = ASCIIToUTF16("Brother");
+  form.fields[1].value = ASCIIToUTF16("Jonathan");
+  form.fields[2].value = ASCIIToUTF16("brotherj@example.com");
   EXPECT_TRUE(form_manager.FillForm(form, WebNode()));
 
   // 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);
 
@@ skipping 80 matching lines @@
 
   FormField field4(string16(),
                    ASCIIToUTF16("postfix"),
                    string16(),
                    ASCIIToUTF16("text"),
                    WebInputElement::defaultMaxLength(),
                    false);
   form->fields.insert(form->fields.begin() + 6, field4);
 
   // Fill the form.
-  form->fields[0].set_value(ASCIIToUTF16("Alpha"));
-  form->fields[1].set_value(ASCIIToUTF16("Brother"));
-  form->fields[2].set_value(ASCIIToUTF16("Abracadabra"));
-  form->fields[3].set_value(ASCIIToUTF16("Joseph"));
-  form->fields[4].set_value(ASCIIToUTF16("Beta"));
-  form->fields[5].set_value(ASCIIToUTF16("Jonathan"));
-  form->fields[6].set_value(ASCIIToUTF16("Omega"));
+  form->fields[0].value = ASCIIToUTF16("Alpha");
+  form->fields[1].value = ASCIIToUTF16("Brother");
+  form->fields[2].value = ASCIIToUTF16("Abracadabra");
+  form->fields[3].value = ASCIIToUTF16("Joseph");
+  form->fields[4].value = ASCIIToUTF16("Beta");
+  form->fields[5].value = ASCIIToUTF16("Jonathan");
+  form->fields[6].value = ASCIIToUTF16("Omega");
   EXPECT_TRUE(form_manager.FillForm(*form, WebNode()));
 
   // Get the input element we want to find.
   WebElement element = web_frame->document().getElementById("firstname");
   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));
@@ skipping 56 matching lines @@
   //  firstname
   //  middlename
   //  lastname
   FormData* form = &forms[0];
   form->fields.erase(form->fields.begin());
   form->fields.erase(form->fields.begin() + 1);
   form->fields.erase(form->fields.begin() + 2);
   form->fields.erase(form->fields.begin() + 3);
 
   // Fill the form.
-  form->fields[0].set_value(ASCIIToUTF16("Brother"));
-  form->fields[1].set_value(ASCIIToUTF16("Joseph"));
-  form->fields[2].set_value(ASCIIToUTF16("Jonathan"));
+  form->fields[0].value = ASCIIToUTF16("Brother");
+  form->fields[1].value = ASCIIToUTF16("Joseph");
+  form->fields[2].value = ASCIIToUTF16("Jonathan");
   EXPECT_TRUE(form_manager.FillForm(*form, WebNode()));
 
   // Get the input element we want to find.
   WebElement element = web_frame->document().getElementById("firstname");
   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));
@@ skipping 76 matching lines @@
   form_manager.GetFormsInFrame(web_frame, FormManager::REQUIRE_NONE, &forms);
   ASSERT_EQ(1U, forms.size());
 
   // After the field modification, the fields in |form| will look like:
   //  firstname
   //  middlename
   //  lastname
   FormData* form = &forms[0];
 
   // Fill the form.
-  form->fields[0].set_value(ASCIIToUTF16("Brother"));
-  form->fields[1].set_value(ASCIIToUTF16("Joseph"));
-  form->fields[2].set_value(ASCIIToUTF16("Jonathan"));
+  form->fields[0].value = ASCIIToUTF16("Brother");
+  form->fields[1].value = ASCIIToUTF16("Joseph");
+  form->fields[2].value = ASCIIToUTF16("Jonathan");
 
   // Alter the label and name used for matching.
-  form->fields[1].set_label(ASCIIToUTF16("bogus"));
-  form->fields[1].set_name(ASCIIToUTF16("bogus"));
+  form->fields[1].label = ASCIIToUTF16("bogus");
+  form->fields[1].name = ASCIIToUTF16("bogus");
 
   EXPECT_TRUE(form_manager.FillForm(*form, WebNode()));
 
   // Get the input element we want to find.
   WebElement element = web_frame->document().getElementById("firstname");
   WebInputElement input_element = element.to<WebInputElement>();
 
   // Find the newly-filled form that contains the input element.
   FormData form2;
   EXPECT_TRUE(form_manager.FindFormWithFormControlElement(
@@ skipping 48 matching lines @@
   ASSERT_EQ(1U, forms.size());
 
   // After the field modification, the fields in |form| will look like:
   //  firstname
   //  middlename
   //  lastname
   FormData* form = &forms[0];
   form->fields.pop_back();
 
   // Fill the form.
-  form->fields[0].set_value(ASCIIToUTF16("Brother"));
-  form->fields[1].set_value(ASCIIToUTF16("Joseph"));
-  form->fields[2].set_value(ASCIIToUTF16("Jonathan"));
+  form->fields[0].value = ASCIIToUTF16("Brother");
+  form->fields[1].value = ASCIIToUTF16("Joseph");
+  form->fields[2].value = ASCIIToUTF16("Jonathan");
   EXPECT_TRUE(form_manager.FillForm(*form, WebNode()));
 
   // Get the input element we want to find.
   WebElement element = web_frame->document().getElementById("firstname");
   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));
@@ skipping 82 matching lines @@
             fields[1]);
   EXPECT_EQ(FormField(string16(),
                       ASCIIToUTF16("email"),
                       string16(),
                       ASCIIToUTF16("text"),
                       WebInputElement::defaultMaxLength(),
                       false),
             fields[2]);
 
   // Fill the form.
-  form.fields[0].set_value(ASCIIToUTF16("Wyatt"));
-  form.fields[1].set_value(ASCIIToUTF16("Earp"));
-  form.fields[2].set_value(ASCIIToUTF16("wyatt@example.com"));
+  form.fields[0].value = ASCIIToUTF16("Wyatt");
+  form.fields[1].value = ASCIIToUTF16("Earp");
+  form.fields[2].value = ASCIIToUTF16("wyatt@example.com");
   EXPECT_TRUE(form_manager.FillForm(form, WebNode()));
 
   // 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);
 
@@ skipping 77 matching lines @@
             fields[1]);
   EXPECT_EQ(FormField(string16(),
                       ASCIIToUTF16("cantelope"),
                       string16(),
                       ASCIIToUTF16("text"),
                       WebInputElement::defaultMaxLength(),
                       false),
             fields[2]);
 
   // Fill the form.
-  form.fields[0].set_value(ASCIIToUTF16("Red"));
-  form.fields[1].set_value(ASCIIToUTF16("Yellow"));
-  form.fields[2].set_value(ASCIIToUTF16("Also Yellow"));
+  form.fields[0].value = ASCIIToUTF16("Red");
+  form.fields[1].value = ASCIIToUTF16("Yellow");
+  form.fields[2].value = ASCIIToUTF16("Also Yellow");
   EXPECT_TRUE(form_manager.FillForm(form, WebNode()));
 
   // 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(string16(), form2.name);
   EXPECT_EQ(GURL(web_frame->url()), form2.origin);
   EXPECT_EQ(GURL("http://abc.com"), form2.action);
 
@@ skipping 220 matching lines @@
             fields[1]);
   EXPECT_EQ(FormField(string16(),
                       ASCIIToUTF16("email"),
                       string16(),
                       ASCIIToUTF16("text"),
                       WebInputElement::defaultMaxLength(),
                       false),
             fields[2]);
 
   // Preview the form and verify that the cursor position has been updated.
-  form.fields[0].set_value(ASCIIToUTF16("Wyatt"));
-  form.fields[1].set_value(ASCIIToUTF16("Earp"));
-  form.fields[2].set_value(ASCIIToUTF16("wyatt@example.com"));
+  form.fields[0].value = ASCIIToUTF16("Wyatt");
+  form.fields[1].value = ASCIIToUTF16("Earp");
+  form.fields[2].value = ASCIIToUTF16("wyatt@example.com");
   EXPECT_TRUE(form_manager.PreviewForm(form, input_element));
   EXPECT_EQ(2, input_element.selectionStart());
   EXPECT_EQ(5, input_element.selectionEnd());
 
   // Fill the form.
   EXPECT_TRUE(form_manager.FillForm(form, input_element));
 
   // Find the newly-filled form that contains the input element.
   FormData form2;
   EXPECT_TRUE(form_manager.FindFormWithFormControlElement(
@@ skipping 541 matching lines @@
                 WebInputElement::defaultMaxLength(),
                 false)));
   EXPECT_TRUE(fields[2].StrictlyEqualsHack(
       FormField(string16(),
                 ASCIIToUTF16("country"),
                 ASCIIToUTF16("AL"),
                 ASCIIToUTF16("select-one"),
                 0,
                 false)));
 }