| OLD | NEW | 
|     1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |     1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
|     2 // Use of this source code is governed by a BSD-style license that can be |     2 // Use of this source code is governed by a BSD-style license that can be | 
|     3 // found in the LICENSE file. |     3 // found in the LICENSE file. | 
|     4  |     4  | 
|     5 #include <vector> |     5 #include <vector> | 
|     6  |     6  | 
|     7 #include "base/format_macros.h" |     7 #include "base/format_macros.h" | 
|     8 #include "base/string16.h" |     8 #include "base/string16.h" | 
|     9 #include "base/string_util.h" |     9 #include "base/string_util.h" | 
|    10 #include "base/stringprintf.h" |    10 #include "base/stringprintf.h" | 
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   230   WebFormControlElementToFormField(element, autofill::EXTRACT_VALUE, &result); |   230   WebFormControlElementToFormField(element, autofill::EXTRACT_VALUE, &result); | 
|   231  |   231  | 
|   232   FormFieldData expected; |   232   FormFieldData expected; | 
|   233   expected.name = ASCIIToUTF16("checkbox"); |   233   expected.name = ASCIIToUTF16("checkbox"); | 
|   234   expected.value = ASCIIToUTF16("mail"); |   234   expected.value = ASCIIToUTF16("mail"); | 
|   235   expected.form_control_type = "checkbox"; |   235   expected.form_control_type = "checkbox"; | 
|   236   expected.is_autofilled = true; |   236   expected.is_autofilled = true; | 
|   237   expected.is_checkable = true; |   237   expected.is_checkable = true; | 
|   238   EXPECT_FORM_FIELD_DATA_EQUALS(expected, result); |   238   EXPECT_FORM_FIELD_DATA_EQUALS(expected, result); | 
|   239  |   239  | 
|   240   web_element = frame->document().getElementById("radio"); |   240   // TODO(ramankk): Uncomment after testing the regression, crbug/170064. | 
 |   241   /* web_element = frame->document().getElementById("radio"); | 
|   241   element = web_element.to<WebInputElement>(); |   242   element = web_element.to<WebInputElement>(); | 
|   242   element.setAutofilled(true); |   243   element.setAutofilled(true); | 
|   243   WebFormControlElementToFormField(element, autofill::EXTRACT_VALUE, &result); |   244   WebFormControlElementToFormField(element, autofill::EXTRACT_VALUE, &result); | 
|   244   expected.name = ASCIIToUTF16("radio"); |   245   expected.name = ASCIIToUTF16("radio"); | 
|   245   expected.value = ASCIIToUTF16("male"); |   246   expected.value = ASCIIToUTF16("male"); | 
|   246   expected.form_control_type = "radio"; |   247   expected.form_control_type = "radio"; | 
|   247   expected.is_autofilled = true; |   248   expected.is_autofilled = true; | 
|   248   expected.is_checkable = true; |   249   expected.is_checkable = true; | 
|   249   EXPECT_FORM_FIELD_DATA_EQUALS(expected, result); |   250   EXPECT_FORM_FIELD_DATA_EQUALS(expected, result); */ | 
|   250 } |   251 } | 
|   251  |   252  | 
|   252 // We should be able to extract a <select> field. |   253 // We should be able to extract a <select> field. | 
|   253 TEST_F(FormAutofillTest, WebFormControlElementToFormFieldSelect) { |   254 TEST_F(FormAutofillTest, WebFormControlElementToFormFieldSelect) { | 
|   254   LoadHTML("<SELECT id=\"element\"/>" |   255   LoadHTML("<SELECT id=\"element\"/>" | 
|   255            "  <OPTION value=\"CA\">California</OPTION>" |   256            "  <OPTION value=\"CA\">California</OPTION>" | 
|   256            "  <OPTION value=\"TX\">Texas</OPTION>" |   257            "  <OPTION value=\"TX\">Texas</OPTION>" | 
|   257            "</SELECT>"); |   258            "</SELECT>"); | 
|   258  |   259  | 
|   259   WebFrame* frame = GetMainFrame(); |   260   WebFrame* frame = GetMainFrame(); | 
| (...skipping 2681 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  2941   expected.form_control_type = "text"; |  2942   expected.form_control_type = "text"; | 
|  2942   expected.max_length = WebInputElement::defaultMaxLength(); |  2943   expected.max_length = WebInputElement::defaultMaxLength(); | 
|  2943   EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields[1]); |  2944   EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields[1]); | 
|  2944  |  2945  | 
|  2945   expected.name = ASCIIToUTF16("country"); |  2946   expected.name = ASCIIToUTF16("country"); | 
|  2946   expected.value = ASCIIToUTF16("AL"); |  2947   expected.value = ASCIIToUTF16("AL"); | 
|  2947   expected.form_control_type = "select-one"; |  2948   expected.form_control_type = "select-one"; | 
|  2948   expected.max_length = 0; |  2949   expected.max_length = 0; | 
|  2949   EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields[2]); |  2950   EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields[2]); | 
|  2950 } |  2951 } | 
| OLD | NEW |