Use explicit WebString conversions in autofill

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 <stddef.h>
 
 #include <vector>
 
 #include "base/format_macros.h"
 #include "base/macros.h"
@@ skipping 401 matching lines @@
     }
   }
 
   // Validate an Autofilled field.
   void ValidateFilledField(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 =
-        GetFormControlElementById(ASCIIToUTF16(field_case.name));
+        GetFormControlElementById(WebString::fromASCII(field_case.name));
     if ((element.formControlType() == "select-one") ||
         (element.formControlType() == "textarea")) {
       value = get_value_function(element);
     } else {
       ASSERT_TRUE(element.formControlType() == "text" ||
                   element.formControlType() == "month");
       value = get_value_function(element);
     }
 
-    const WebString expected_value = ASCIIToUTF16(field_case.expected_value);
+    const WebString expected_value =
+        WebString::fromASCII(field_case.expected_value);
     if (expected_value.isEmpty())
       EXPECT_TRUE(value.isEmpty());
     else
       EXPECT_EQ(expected_value.utf8(), value.utf8());
 
     EXPECT_EQ(field_case.should_be_autofilled, element.isAutofilled());
   }
 
   WebFormControlElement GetFormControlElementById(const WebString& id) {
     return GetMainFrame()->document().getElementById(
@@ skipping 624 matching lines @@
     ASSERT_NE(nullptr, web_frame);
 
     FormCache form_cache(*web_frame);
     std::vector<FormData> forms = form_cache.ExtractNewForms();
     ASSERT_EQ(1U, forms.size());
 
     // Get the input element we want to find.
     WebInputElement input_element = GetInputElementById("firstname");
 
     // Simulate typing by modifying the field value.
-    input_element.setValue(ASCIIToUTF16("Wy"));
+    input_element.setValue(WebString::fromASCII("Wy"));
 
     // Find the form that contains the input element.
     FormData form;
     FormFieldData field;
     EXPECT_TRUE(
         FindFormAndFieldForFormControlElement(input_element, &form, &field));
     EXPECT_EQ(GetCanonicalOriginForDocument(web_frame->document()),
               form.origin);
     if (!unowned) {
       EXPECT_EQ(ASCIIToUTF16("TestForm"), form.name);
@@ skipping 302 matching lines @@
     WebInputElement lastname = GetInputElementById("lastname");
     lastname.setAutofilled(true);
     WebInputElement email = GetInputElementById("email");
     email.setAutofilled(true);
     WebInputElement email2 = GetInputElementById("email2");
     email2.setAutofilled(true);
     WebInputElement phone = GetInputElementById("phone");
     phone.setAutofilled(true);
 
     // Set the suggested values on two of the elements.
-    lastname.setSuggestedValue(ASCIIToUTF16("Earp"));
-    email.setSuggestedValue(ASCIIToUTF16("wyatt@earp.com"));
-    email2.setSuggestedValue(ASCIIToUTF16("wyatt@earp.com"));
-    phone.setSuggestedValue(ASCIIToUTF16("650-777-9999"));
+    lastname.setSuggestedValue(WebString::fromASCII("Earp"));
+    email.setSuggestedValue(WebString::fromASCII("wyatt@earp.com"));
+    email2.setSuggestedValue(WebString::fromASCII("wyatt@earp.com"));
+    phone.setSuggestedValue(WebString::fromASCII("650-777-9999"));
 
     // Clear the previewed fields.
     EXPECT_TRUE(ClearPreviewedFormWithElement(lastname, false));
 
     // Fields with empty suggestions suggestions are not modified.
-    EXPECT_EQ(ASCIIToUTF16("Wyatt"), firstname.value());
+    EXPECT_EQ(ASCIIToUTF16("Wyatt"), firstname.value().utf16());
     EXPECT_TRUE(firstname.suggestedValue().isEmpty());
     EXPECT_TRUE(firstname.isAutofilled());
 
     // Verify the previewed fields are cleared.
     EXPECT_TRUE(lastname.value().isEmpty());
     EXPECT_TRUE(lastname.suggestedValue().isEmpty());
     EXPECT_FALSE(lastname.isAutofilled());
     EXPECT_TRUE(email.value().isEmpty());
     EXPECT_TRUE(email.suggestedValue().isEmpty());
     EXPECT_FALSE(email.isAutofilled());
@@ skipping 25 matching lines @@
     lastname.setAutofilled(true);
     WebInputElement email = GetInputElementById("email");
     email.setAutofilled(true);
     WebInputElement email2 = GetInputElementById("email2");
     email2.setAutofilled(true);
     WebInputElement phone = GetInputElementById("phone");
     phone.setAutofilled(true);
 
 
     // Set the suggested values on all of the elements.
-    firstname.setSuggestedValue(ASCIIToUTF16("Wyatt"));
-    lastname.setSuggestedValue(ASCIIToUTF16("Earp"));
-    email.setSuggestedValue(ASCIIToUTF16("wyatt@earp.com"));
-    email2.setSuggestedValue(ASCIIToUTF16("wyatt@earp.com"));
-    phone.setSuggestedValue(ASCIIToUTF16("650-777-9999"));
+    firstname.setSuggestedValue(WebString::fromASCII("Wyatt"));
+    lastname.setSuggestedValue(WebString::fromASCII("Earp"));
+    email.setSuggestedValue(WebString::fromASCII("wyatt@earp.com"));
+    email2.setSuggestedValue(WebString::fromASCII("wyatt@earp.com"));
+    phone.setSuggestedValue(WebString::fromASCII("650-777-9999"));
 
     // Clear the previewed fields.
     EXPECT_TRUE(ClearPreviewedFormWithElement(firstname, false));
 
     // Fields with non-empty values are restored.
-    EXPECT_EQ(ASCIIToUTF16("W"), firstname.value());
+    EXPECT_EQ(ASCIIToUTF16("W"), firstname.value().utf16());
     EXPECT_TRUE(firstname.suggestedValue().isEmpty());
     EXPECT_FALSE(firstname.isAutofilled());
     EXPECT_EQ(1, firstname.selectionStart());
     EXPECT_EQ(1, firstname.selectionEnd());
 
     // Verify the previewed fields are cleared.
     EXPECT_TRUE(lastname.value().isEmpty());
     EXPECT_TRUE(lastname.suggestedValue().isEmpty());
     EXPECT_FALSE(lastname.isAutofilled());
     EXPECT_TRUE(email.value().isEmpty());
@@ skipping 22 matching lines @@
     WebInputElement lastname = GetInputElementById("lastname");
     lastname.setAutofilled(true);
     WebInputElement email = GetInputElementById("email");
     email.setAutofilled(true);
     WebInputElement email2 = GetInputElementById("email2");
     email2.setAutofilled(true);
     WebInputElement phone = GetInputElementById("phone");
     phone.setAutofilled(true);
 
     // Set the suggested values on all of the elements.
-    firstname.setSuggestedValue(ASCIIToUTF16("Wyatt"));
-    lastname.setSuggestedValue(ASCIIToUTF16("Earp"));
-    email.setSuggestedValue(ASCIIToUTF16("wyatt@earp.com"));
-    email2.setSuggestedValue(ASCIIToUTF16("wyatt@earp.com"));
-    phone.setSuggestedValue(ASCIIToUTF16("650-777-9999"));
+    firstname.setSuggestedValue(WebString::fromASCII("Wyatt"));
+    lastname.setSuggestedValue(WebString::fromASCII("Earp"));
+    email.setSuggestedValue(WebString::fromASCII("wyatt@earp.com"));
+    email2.setSuggestedValue(WebString::fromASCII("wyatt@earp.com"));
+    phone.setSuggestedValue(WebString::fromASCII("650-777-9999"));
 
     // Clear the previewed fields.
     EXPECT_TRUE(ClearPreviewedFormWithElement(firstname, true));
 
     // Fields with non-empty values are restored.
-    EXPECT_EQ(ASCIIToUTF16("W"), firstname.value());
+    EXPECT_EQ(ASCIIToUTF16("W"), firstname.value().utf16());
     EXPECT_TRUE(firstname.suggestedValue().isEmpty());
     EXPECT_TRUE(firstname.isAutofilled());
     EXPECT_EQ(1, firstname.selectionStart());
     EXPECT_EQ(1, firstname.selectionEnd());
 
     // Verify the previewed fields are cleared.
     EXPECT_TRUE(lastname.value().isEmpty());
     EXPECT_TRUE(lastname.suggestedValue().isEmpty());
     EXPECT_FALSE(lastname.isAutofilled());
     EXPECT_TRUE(email.value().isEmpty());
@@ skipping 24 matching lines @@
     lastname.setAutofilled(true);
     WebInputElement email = GetInputElementById("email");
     email.setAutofilled(true);
     WebInputElement phone = GetInputElementById("phone");
     phone.setAutofilled(true);
 
     // Clear the fields.
     EXPECT_TRUE(form_cache.ClearFormWithElement(firstname));
 
     // Verify only autofilled fields are cleared.
-    EXPECT_EQ(ASCIIToUTF16("Wyatt"), firstname.value());
+    EXPECT_EQ(ASCIIToUTF16("Wyatt"), firstname.value().utf16());
     EXPECT_TRUE(firstname.suggestedValue().isEmpty());
     EXPECT_FALSE(firstname.isAutofilled());
     EXPECT_TRUE(lastname.value().isEmpty());
     EXPECT_TRUE(lastname.suggestedValue().isEmpty());
     EXPECT_FALSE(lastname.isAutofilled());
     EXPECT_TRUE(email.value().isEmpty());
     EXPECT_TRUE(email.suggestedValue().isEmpty());
     EXPECT_FALSE(email.isAutofilled());
     EXPECT_TRUE(phone.value().isEmpty());
     EXPECT_TRUE(phone.suggestedValue().isEmpty());
@@ skipping 406 matching lines @@
     { "select", "select-one", "state" },
     // <textarea> elements should also behave no differently from text fields.
     { "textarea", "textarea", "street-address" },
     // Very long attribute values should be replaced by a default string, to
     // prevent malicious websites from DOSing the browser process.
     { "malicious", "text", "x-max-data-length-exceeded" },
   };
 
   WebDocument document = frame->document();
   for (size_t i = 0; i < arraysize(test_cases); ++i) {
-    WebFormControlElement element =
-        GetFormControlElementById(ASCIIToUTF16(test_cases[i].element_id));
+    WebFormControlElement element = GetFormControlElementById(
+        WebString::fromASCII(test_cases[i].element_id));
     FormFieldData result;
     WebFormControlElementToFormField(element, nullptr, EXTRACT_NONE, &result);
 
     FormFieldData expected;
     expected.name = ASCIIToUTF16(test_cases[i].element_id);
     expected.form_control_type = test_cases[i].form_control_type;
     expected.autocomplete_attribute = test_cases[i].autocomplete_attribute;
     if (test_cases[i].form_control_type == "text")
       expected.max_length = WebInputElement::defaultMaxLength();
     else
@@ skipping 2658 matching lines @@
 
     if (test_case.has_extracted_form) {
       EXPECT_EQ(test_case.is_form_tag, forms[0].is_form_tag);
       EXPECT_EQ(test_case.is_formless_checkout, forms[0].is_formless_checkout);
     }
   }
 }
 
 }  // namespace form_util
 }  // namespace autofill