AutoFill: Handle filling select controls.

BUG=38222
TEST=none

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

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

3 files changed, 130 insertions, 105 deletions

diff --git a/chrome/renderer/form_manager.cc b/chrome/renderer/form_manager.cc
index 2752dcb..8206d29 100644
--- a/chrome/renderer/form_manager.cc
+++ b/chrome/renderer/form_manager.cc
@@ -10,20 +10,24 @@
 #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/WebFrame.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebInputElement.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebLabelElement.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebNode.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebNodeList.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebSelectElement.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebVector.h"
 
 using WebKit::WebDocument;
 using WebKit::WebElement;
+using WebKit::WebFormControlElement;
 using WebKit::WebFormElement;
 using WebKit::WebFrame;
 using WebKit::WebInputElement;
 using WebKit::WebLabelElement;
 using WebKit::WebNode;
 using WebKit::WebNodeList;
+using WebKit::WebSelectElement;
 using WebKit::WebString;
 using WebKit::WebVector;
 using webkit_glue::FormData;
@@ -49,13 +53,13 @@ void FormManager::ExtractForms(WebFrame* frame) {
     form_elements->form_element = web_forms[i];
 
     // Form elements loop.
-    WebVector<WebInputElement> input_elements;
-    form_elements->form_element.getInputElements(input_elements);
-    for (size_t j = 0; j < input_elements.size(); ++j) {
-      WebInputElement element = input_elements[j];
+    WebVector<WebFormControlElement> control_elements;
+    form_elements->form_element.getFormControlElements(control_elements);
+    for (size_t j = 0; j < control_elements.size(); ++j) {
+      WebFormControlElement element = control_elements[j];
       // TODO(jhawkins): Remove this check when we have labels.
       if (!element.nameForAutofill().isEmpty())
-        form_elements->input_elements[element.nameForAutofill()] = element;
+        form_elements->control_elements[element.nameForAutofill()] = element;
     }
 
     form_elements_map_[frame].push_back(form_elements);
@@ -85,7 +89,7 @@ void FormManager::GetForms(std::vector<FormData>* forms,
   }
 }
 
-bool FormManager::FindForm(const WebInputElement& element,
+bool FormManager::FindForm(const WebFormControlElement& element,
                            FormData* form) {
   // Frame loop.
   for (WebFrameFormElementMap::iterator iter = form_elements_map_.begin();
@@ -97,8 +101,8 @@ bool FormManager::FindForm(const WebInputElement& element,
          form_iter != iter->second.end(); ++form_iter) {
       FormElement* form_element = *form_iter;
 
-      if (form_element->input_elements.find(element.nameForAutofill()) !=
-          form_element->input_elements.end()) {
+      if (form_element->control_elements.find(element.nameForAutofill()) !=
+          form_element->control_elements.end()) {
         FormElementToFormData(frame, form_element, REQUIRE_NONE, form);
         return true;
       }
@@ -125,7 +129,7 @@ bool FormManager::FillForm(const FormData& form) {
       // evaluate to |true| for some reason TBD, so forcing to string16.
       string16 element_name((*form_iter)->form_element.name());
       if (element_name == form.name &&
-          (*form_iter)->input_elements.size() == form.fields.size()) {
+          (*form_iter)->control_elements.size() == form.fields.size()) {
         form_element = *form_iter;
         break;
       }
@@ -135,18 +139,26 @@ bool FormManager::FillForm(const FormData& form) {
   if (!form_element)
     return false;
 
-  DCHECK(form_element->input_elements.size() == form.fields.size());
+  DCHECK(form_element->control_elements.size() == form.fields.size());
 
   size_t i = 0;
-  for (FormInputElementMap::iterator iter =
-           form_element->input_elements.begin();
-      iter != form_element->input_elements.end(); ++iter, ++i) {
+  for (FormControlElementMap::iterator iter =
+           form_element->control_elements.begin();
+      iter != form_element->control_elements.end(); ++iter, ++i) {
     DCHECK_EQ(form.fields[i].name(), iter->second.nameForAutofill());
 
     if (!form.fields[i].value().empty() &&
-        iter->second.inputType() != WebInputElement::Submit) {
-      iter->second.setValue(form.fields[i].value());
-      iter->second.setAutofilled(true);
+        iter->second.formControlType() != ASCIIToUTF16("submit")) {
+      if (iter->second.formControlType() == ASCIIToUTF16("text")) {
+        WebInputElement input_element =
+            iter->second.toElement<WebInputElement>();
+        input_element.setValue(form.fields[i].value());
+        input_element.setAutofilled(true);
+      } else if (iter->second.formControlType() == ASCIIToUTF16("select-one")) {
+        WebSelectElement select_element =
+            iter->second.toElement<WebSelectElement>();
+        select_element.setValue(form.fields[i].value());
+      }
     }
   }
 
@@ -183,35 +195,44 @@ void FormManager::FormElementToFormData(WebFrame* frame,
     form->action = GURL(form_element->form_element.action());
 
   // Form elements loop.
-  for (FormInputElementMap::const_iterator element_iter =
-           form_element->input_elements.begin();
-       element_iter != form_element->input_elements.end(); ++element_iter) {
-    const WebInputElement& input_element = element_iter->second;
+  for (FormControlElementMap::const_iterator element_iter =
+           form_element->control_elements.begin();
+       element_iter != form_element->control_elements.end(); ++element_iter) {
+    WebFormControlElement control_element = element_iter->second;
 
     if (requirements & REQUIRE_AUTOCOMPLETE &&
-        !input_element.autoComplete())
-      continue;
+        control_element.formControlType() == ASCIIToUTF16("text")) {
+      const WebInputElement& input_element =
+          control_element.toConstElement<WebInputElement>();
+      if (!input_element.autoComplete())
+        continue;
+    }
 
-    if (requirements & REQUIRE_ELEMENTS_ENABLED &&
-        !input_element.isEnabledFormControl())
+    if (requirements & REQUIRE_ELEMENTS_ENABLED && !control_element.isEnabled())
       continue;
 
-    string16 label = LabelForElement(input_element);
-    string16 name = input_element.nameForAutofill();
-    string16 value = input_element.value();
-    string16 form_control_type = input_element.formControlType();
-    WebInputElement::InputType input_type = input_element.inputType();
-    FormField field = FormField(label,
-                                name,
-                                value,
-                                form_control_type,
-                                input_type);
-    form->fields.push_back(field);
+    string16 label = LabelForElement(control_element);
+    string16 name = control_element.nameForAutofill();
+
+    string16 value;
+    if (control_element.formControlType() == ASCIIToUTF16("text")) {
+      const WebInputElement& input_element =
+          control_element.toConstElement<WebInputElement>();
+      value = input_element.value();
+    } else if (control_element.formControlType() ==
+               ASCIIToUTF16("select-one")) {
+      WebSelectElement select_element =
+          control_element.toElement<WebSelectElement>();
+      value = select_element.value();
+    }
+
+    string16 form_control_type = control_element.formControlType();
+    form->fields.push_back(FormField(label, name, value, form_control_type));
   }
 }
 
 // static
-string16 FormManager::LabelForElement(const WebInputElement& element) {
+string16 FormManager::LabelForElement(const WebFormControlElement& element) {
   WebNodeList labels = element.document().getElementsByTagName("label");
   for (unsigned i = 0; i < labels.length(); ++i) {
     WebElement e = labels.item(i).toElement<WebElement>();
@@ -227,7 +248,8 @@ string16 FormManager::LabelForElement(const WebInputElement& element) {
 }
 
 // static
-string16 FormManager::InferLabelForElement(const WebInputElement& element) {
+string16 FormManager::InferLabelForElement(
+    const WebFormControlElement& element) {
   string16 inferred_label;
   WebNode previous = element.previousSibling();
   if (!previous.isNull()) {
diff --git a/chrome/renderer/form_manager.h b/chrome/renderer/form_manager.h
index 4928838..5445a4f 100644
--- a/chrome/renderer/form_manager.h
+++ b/chrome/renderer/form_manager.h
@@ -9,8 +9,8 @@
 #include <vector>
 
 #include "base/string16.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebFormControlElement.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFormElement.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebInputElement.h"
 #include "webkit/glue/form_data.h"
 
 namespace WebKit {
@@ -37,9 +37,9 @@ class FormManager {
   void GetForms(std::vector<webkit_glue::FormData>* forms,
                 RequirementsMask requirements);
 
-  // Finds the form that contains |input_element| and returns it in |form|.
-  // Returns false if the form is not found.
-  bool FindForm(const WebKit::WebInputElement& input_element,
+  // Finds the form that contains |element| and returns it in |form|. Returns
+  // false if the form is not found.
+  bool FindForm(const WebKit::WebFormControlElement& element,
                 webkit_glue::FormData* form);
 
   // Fills the form represented by |form|.  |form| should have the name set to
@@ -53,13 +53,15 @@ class FormManager {
   void Reset();
 
  private:
-  // A map of WebInputElements keyed by each element's name.
-  typedef std::map<string16, WebKit::WebInputElement> FormInputElementMap;
+  // A map of WebFormControlElements keyed by each element's name.
+  typedef std::map<string16, WebKit::WebFormControlElement>
+      FormControlElementMap;
 
-  // Stores the WebFormElement and the map of input elements for each form.
+  // Stores the WebFormElement and the map of form control elements for each
+  // form.
   struct FormElement {
     WebKit::WebFormElement form_element;
-    FormInputElementMap input_elements;
+    FormControlElementMap control_elements;
   };
 
   // A map of vectors of FormElements keyed by the WebFrame containing each
@@ -78,12 +80,13 @@ class FormManager {
                              webkit_glue::FormData* form);
 
   // Returns the corresponding label for |element|.
-  static string16 LabelForElement(const WebKit::WebInputElement& element);
+  static string16 LabelForElement(const WebKit::WebFormControlElement& element);
 
   // Infers corresponding label for |element| from surrounding context in the
   // DOM.  Contents of preceeding <p> tag or preceeding text element found in
   // the form.
-  static string16 InferLabelForElement(const WebKit::WebInputElement& element);
+  static string16 InferLabelForElement(
+      const WebKit::WebFormControlElement& element);
 
   // The map of form elements.
   WebFrameFormElementMap form_elements_map_;
diff --git a/chrome/renderer/form_manager_unittest.cc b/chrome/renderer/form_manager_unittest.cc
index c288d19..3b57d98 100644
--- a/chrome/renderer/form_manager_unittest.cc
+++ b/chrome/renderer/form_manager_unittest.cc
@@ -50,18 +50,18 @@ TEST_F(FormManagerTest, ExtractForms) {
   EXPECT_EQ(FormField(string16(),
                       ASCIIToUTF16("firstname"),
                       ASCIIToUTF16("John"),
-                      ASCIIToUTF16("text"),
-                      WebInputElement::Text), fields[0]);
+                      ASCIIToUTF16("text")),
+                      fields[0]);
   EXPECT_EQ(FormField(string16(),
                       ASCIIToUTF16("lastname"),
                       ASCIIToUTF16("Smith"),
-                      ASCIIToUTF16("text"),
-                      WebInputElement::Text), fields[1]);
+                      ASCIIToUTF16("text")),
+                      fields[1]);
   EXPECT_EQ(FormField(string16(),
                       ASCIIToUTF16("reply-send"),
                       ASCIIToUTF16("Send"),
-                      ASCIIToUTF16("submit"),
-                      WebInputElement::Submit), fields[2]);
+                      ASCIIToUTF16("submit")),
+                      fields[2]);
 }
 
 TEST_F(FormManagerTest, ExtractMultipleForms) {
@@ -95,13 +95,13 @@ TEST_F(FormManagerTest, ExtractMultipleForms) {
   EXPECT_EQ(FormField(string16(),
                       ASCIIToUTF16("firstname"),
                       ASCIIToUTF16("John"),
-                      ASCIIToUTF16("text"),
-                      WebInputElement::Text), fields[0]);
+                      ASCIIToUTF16("text")),
+                      fields[0]);
   EXPECT_EQ(FormField(string16(),
                       ASCIIToUTF16("reply-send"),
                       ASCIIToUTF16("Send"),
-                      ASCIIToUTF16("submit"),
-                      WebInputElement::Submit), fields[1]);
+                      ASCIIToUTF16("submit")),
+                      fields[1]);
 
   // Second form.
   const FormData& form2 = forms[1];
@@ -114,13 +114,13 @@ TEST_F(FormManagerTest, ExtractMultipleForms) {
   EXPECT_EQ(FormField(string16(),
                       ASCIIToUTF16("lastname"),
                       ASCIIToUTF16("Smith"),
-                      ASCIIToUTF16("text"),
-                      WebInputElement::Text), fields2[0]);
+                      ASCIIToUTF16("text")),
+                      fields2[0]);
   EXPECT_EQ(FormField(string16(),
                       ASCIIToUTF16("second"),
                       ASCIIToUTF16("Submit"),
-                      ASCIIToUTF16("submit"),
-                      WebInputElement::Submit), fields2[1]);
+                      ASCIIToUTF16("submit")),
+                      fields2[1]);
 }
 
 TEST_F(FormManagerTest, GetFormsAutocomplete) {
@@ -175,13 +175,13 @@ TEST_F(FormManagerTest, GetFormsAutocomplete) {
   EXPECT_EQ(FormField(string16(),
                       ASCIIToUTF16("lastname"),
                       ASCIIToUTF16("Smith"),
-                      ASCIIToUTF16("text"),
-                      WebInputElement::Text), fields[0]);
+                      ASCIIToUTF16("text")),
+                      fields[0]);
   EXPECT_EQ(FormField(string16(),
                       ASCIIToUTF16("reply"),
                       ASCIIToUTF16("Send"),
-                      ASCIIToUTF16("submit"),
-                      WebInputElement::Submit), fields[1]);
+                      ASCIIToUTF16("submit")),
+                      fields[1]);
 }
 
 TEST_F(FormManagerTest, GetFormsElementsEnabled) {
@@ -212,13 +212,13 @@ TEST_F(FormManagerTest, GetFormsElementsEnabled) {
   EXPECT_EQ(FormField(string16(),
                       ASCIIToUTF16("lastname"),
                       ASCIIToUTF16("Smith"),
-                      ASCIIToUTF16("text"),
-                      WebInputElement::Text), fields[0]);
+                      ASCIIToUTF16("text")),
+                      fields[0]);
   EXPECT_EQ(FormField(string16(),
                       ASCIIToUTF16("submit"),
                       ASCIIToUTF16("Send"),
-                      ASCIIToUTF16("submit"),
-                      WebInputElement::Submit), fields[1]);
+                      ASCIIToUTF16("submit")),
+                      fields[1]);
 }
 
 TEST_F(FormManagerTest, FindForm) {
@@ -256,18 +256,18 @@ TEST_F(FormManagerTest, FindForm) {
   EXPECT_EQ(FormField(string16(),
                       ASCIIToUTF16("firstname"),
                       ASCIIToUTF16("John"),
-                      ASCIIToUTF16("text"),
-                      WebInputElement::Text), fields[0]);
+                      ASCIIToUTF16("text")),
+                      fields[0]);
   EXPECT_EQ(FormField(string16(),
                       ASCIIToUTF16("lastname"),
                       ASCIIToUTF16("Smith"),
-                      ASCIIToUTF16("text"),
-                      WebInputElement::Text), fields[1]);
+                      ASCIIToUTF16("text")),
+                      fields[1]);
   EXPECT_EQ(FormField(string16(),
                       ASCIIToUTF16("reply-send"),
                       ASCIIToUTF16("Send"),
-                      ASCIIToUTF16("submit"),
-                      WebInputElement::Submit), fields[2]);
+                      ASCIIToUTF16("submit")),
+                      fields[2]);
 }
 
 TEST_F(FormManagerTest, FillForm) {
@@ -305,18 +305,18 @@ TEST_F(FormManagerTest, FillForm) {
   EXPECT_EQ(FormField(string16(),
                       ASCIIToUTF16("firstname"),
                       string16(),
-                      ASCIIToUTF16("text"),
-                      WebInputElement::Text), fields[0]);
+                      ASCIIToUTF16("text")),
+                      fields[0]);
   EXPECT_EQ(FormField(string16(),
                       ASCIIToUTF16("lastname"),
                       string16(),
-                      ASCIIToUTF16("text"),
-                      WebInputElement::Text), fields[1]);
+                      ASCIIToUTF16("text")),
+                      fields[1]);
   EXPECT_EQ(FormField(string16(),
                       ASCIIToUTF16("reply-send"),
                       ASCIIToUTF16("Send"),
-                      ASCIIToUTF16("submit"),
-                      WebInputElement::Submit), fields[2]);
+                      ASCIIToUTF16("submit")),
+                      fields[2]);
 
   // Fill the form.
   form.fields[0].set_value(ASCIIToUTF16("Wyatt"));
@@ -335,18 +335,18 @@ TEST_F(FormManagerTest, FillForm) {
   EXPECT_EQ(FormField(string16(),
                       ASCIIToUTF16("firstname"),
                       ASCIIToUTF16("Wyatt"),
-                      ASCIIToUTF16("text"),
-                      WebInputElement::Text), fields2[0]);
+                      ASCIIToUTF16("text")),
+                      fields2[0]);
   EXPECT_EQ(FormField(string16(),
                       ASCIIToUTF16("lastname"),
                       ASCIIToUTF16("Earp"),
-                      ASCIIToUTF16("text"),
-                      WebInputElement::Text), fields2[1]);
+                      ASCIIToUTF16("text")),
+                      fields2[1]);
   EXPECT_EQ(FormField(string16(),
                       ASCIIToUTF16("reply-send"),
                       ASCIIToUTF16("Send"),
-                      ASCIIToUTF16("submit"),
-                      WebInputElement::Submit), fields2[2]);
+                      ASCIIToUTF16("submit")),
+                      fields2[2]);
 }
 
 TEST_F(FormManagerTest, Reset) {
@@ -403,18 +403,18 @@ TEST_F(FormManagerTest, Labels) {
   EXPECT_EQ(FormField(ASCIIToUTF16("First name:"),
                       ASCIIToUTF16("firstname"),
                       ASCIIToUTF16("John"),
-                      ASCIIToUTF16("text"),
-                      WebInputElement::Text), fields[0]);
+                      ASCIIToUTF16("text")),
+                      fields[0]);
   EXPECT_EQ(FormField(ASCIIToUTF16("Last name:"),
                       ASCIIToUTF16("lastname"),
                       ASCIIToUTF16("Smith"),
-                      ASCIIToUTF16("text"),
-                      WebInputElement::Text), fields[1]);
+                      ASCIIToUTF16("text")),
+                      fields[1]);
   EXPECT_EQ(FormField(string16(),
                       ASCIIToUTF16("reply-send"),
                       ASCIIToUTF16("Send"),
-                      ASCIIToUTF16("submit"),
-                      WebInputElement::Submit), fields[2]);
+                      ASCIIToUTF16("submit")),
+                      fields[2]);
 }
 
 TEST_F(FormManagerTest, LabelsFromInferredText) {
@@ -446,18 +446,18 @@ TEST_F(FormManagerTest, LabelsFromInferredText) {
   EXPECT_EQ(FormField(ASCIIToUTF16("First name:"),
                       ASCIIToUTF16("firstname"),
                       ASCIIToUTF16("John"),
-                      ASCIIToUTF16("text"),
-                      WebInputElement::Text), fields[0]);
+                      ASCIIToUTF16("text")),
+                      fields[0]);
   EXPECT_EQ(FormField(ASCIIToUTF16("Last name:"),
                       ASCIIToUTF16("lastname"),
                       ASCIIToUTF16("Smith"),
-                      ASCIIToUTF16("text"),
-                      WebInputElement::Text), fields[1]);
+                      ASCIIToUTF16("text")),
+                      fields[1]);
   EXPECT_EQ(FormField(string16(),
                       ASCIIToUTF16("reply-send"),
                       ASCIIToUTF16("Send"),
-                      ASCIIToUTF16("submit"),
-                      WebInputElement::Submit), fields[2]);
+                      ASCIIToUTF16("submit")),
+                      fields[2]);
 }
 
 TEST_F(FormManagerTest, LabelsFromInferredParagraph) {
@@ -489,18 +489,18 @@ TEST_F(FormManagerTest, LabelsFromInferredParagraph) {
   EXPECT_EQ(FormField(ASCIIToUTF16("First name:"),
                       ASCIIToUTF16("firstname"),
                       ASCIIToUTF16("John"),
-                      ASCIIToUTF16("text"),
-                      WebInputElement::Text), fields[0]);
+                      ASCIIToUTF16("text")),
+                      fields[0]);
   EXPECT_EQ(FormField(ASCIIToUTF16("Last name:"),
                       ASCIIToUTF16("lastname"),
                       ASCIIToUTF16("Smith"),
-                      ASCIIToUTF16("text"),
-                      WebInputElement::Text), fields[1]);
+                      ASCIIToUTF16("text")),
+                      fields[1]);
   EXPECT_EQ(FormField(string16(),
                       ASCIIToUTF16("reply-send"),
                       ASCIIToUTF16("Send"),
-                      ASCIIToUTF16("submit"),
-                      WebInputElement::Submit), fields[2]);
+                      ASCIIToUTF16("submit")),
+                      fields[2]);
 }
 
 }  // namespace