Add Autofill preview support for <select> input fields

chrome/renderer/autofill/form_autofill_browsertest.cc

 // Copyright (c) 2012 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/format_macros.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
@@ skipping 214 matching lines @@
   }
 
   // Validate an Autofilled field.
   void ValidteFilledField(const AutofillFieldCase& field_case,
                           GetValueFunction get_value_function) {
     SCOPED_TRACE(base::StringPrintf("Verify autofilled value for field %s",
                                     field_case.name));
     WebString value;
     WebFormControlElement element = GetMainFrame()->document().getElementById(
         ASCIIToUTF16(field_case.name)).to<WebFormControlElement>();
-    if (element.formControlType() == "select-one") {
-      value = element.to<WebSelectElement>().value();
-    } else if (element.formControlType() == "textarea") {
+    if ((element.formControlType() == "select-one") ||
+        (element.formControlType() == "textarea"))
       value = get_value_function(element);
-    } else {
+    else
+    {

[Ilya Sherman, 2014/02/08 01:40:41]

nit: Please keep all the curly braces as they were, per the Chromium style
guide.

       ASSERT_TRUE(element.formControlType() == "text" ||
                   element.formControlType() == "month");
       value = get_value_function(element);
     }
 
     const WebString expected_value = ASCIIToUTF16(field_case.expected_value);
     if (expected_value.isEmpty())
       EXPECT_TRUE(value.isEmpty());
     else
       EXPECT_EQ(expected_value, value);
 
     EXPECT_EQ(field_case.should_be_autofilled, element.isAutofilled());
   }
 
   static void FillFormForAllFieldsWrapper(const FormData& form,
                                        const WebInputElement& element) {
     FillFormForAllElements(form, element.form());
   }
 
   static void FillFormIncludingNonFocusableElementsWrapper(
       const FormData& form,
       const WebInputElement& element) {
     FillFormIncludingNonFocusableElements(form, element.form());
   }
 
   static WebString GetValueWrapper(WebFormControlElement element) {
     if (element.formControlType() == "textarea")
       return element.to<WebTextAreaElement>().value();
 
+    if (element.formControlType() == "select-one")
+      return element.to<WebSelectElement>().value();
+
     return element.to<WebInputElement>().value();
   }
 
   static WebString GetSuggestedValueWrapper(WebFormControlElement element) {
     if (element.formControlType() == "textarea")
       return element.to<WebTextAreaElement>().suggestedValue();
 
+    if (element.formControlType() == "select-one")
+      return element.to<WebSelectElement>().suggestedValue();
+
     return element.to<WebInputElement>().suggestedValue();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FormAutofillTest);
 };
 
 // We should be able to extract a normal text field.
 TEST_F(FormAutofillTest, WebFormControlElementToFormField) {
   LoadHTML("<INPUT type=\"text\" id=\"element\" value=\"value\"/>");
@@ skipping 912 matching lines @@
       // Fields with "visibility: hidden" should not be previewed.
       {"text", "invisible", "", "", false, "suggested invisible",
        ""},
       // Fields with "display:none" should not previewed.
       {"text", "displaynone", "", "", false, "suggested displaynone",
        ""},
       // Regular <input type="month"> should not be previewed.
       {"month", "month", "", "", false, "2017-11", ""},
       // Non-empty <input type="month"> should not be previewed.
       {"month", "month-nonempty", "2011-12", "", false, "2017-11", ""},
-      // Regular select fields preview is not yet supported
-      {"select-one", "select", "", "", false, "TX", ""},
-      // Select fields preview is not yet supported
-      {"select-one", "select-nonempty", "CA", "", false, "TX", "CA"},
+      // Regular select fields should be previewed.
+      {"select-one", "select", "", "", true, "TX", "TX"},
+      // Select fields should be previewed even if they already have a
+      // non-empty value.
+      {"select-one", "select-nonempty", "CA", "", true, "TX", "TX"},
       // Normal textarea elements should be previewed.
       {"textarea", "textarea", "", "", true, "suggested multi-\nline value",
        "suggested multi-\nline value"},
       // Nonempty textarea elements should not be previewed.
       {"textarea", "textarea-nonempty", "Go\naway!", "", false,
        "suggested multi-\nline value", ""},
   };
   TestFormFillFunctions(kFormHtml, field_cases, arraysize(field_cases),
                         &PreviewForm, &GetSuggestedValueWrapper);
 
@@ skipping 1992 matching lines @@
   EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields[1]);
 
   expected.name = ASCIIToUTF16("country");
   expected.value = ASCIIToUTF16("AL");
   expected.form_control_type = "select-one";
   expected.max_length = 0;
   EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields[2]);
 }
 
 }  // namespace autofill