Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6556)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/renderer/autofill/form_autofill_browsertest.cc

Issue 105493002: Use base namespace for string16 in chrome/renderer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/renderer/autofill/autofill_renderer_browsertest.cc ('k') | chrome/renderer/autofill/password_autofill_agent_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/autofill/form_autofill_browsertest.cc
diff --git a/chrome/renderer/autofill/form_autofill_browsertest.cc b/chrome/renderer/autofill/form_autofill_browsertest.cc
index ca2af2882ec935ac7fffab14fc9691ee64ddf9bf..ba454f1f067ecbb13e0fda119f2b34c0a94f96ed 100644
--- a/chrome/renderer/autofill/form_autofill_browsertest.cc
+++ b/chrome/renderer/autofill/form_autofill_browsertest.cc
@@ -92,17 +92,17 @@ class FormAutofillTest : public ChromeRenderViewTest {
virtual ~FormAutofillTest() {}
void ExpectLabels(const char* html,
- const std::vector<string16>& labels,
- const std::vector<string16>& names,
- const std::vector<string16>& values) {
+ const std::vector<base::string16>& labels,
+ const std::vector<base::string16>& names,
+ const std::vector<base::string16>& values) {
std::vector<std::string> control_types(labels.size(), "text");
ExpectLabelsAndTypes(html, labels, names, values, control_types);
}
void ExpectLabelsAndTypes(const char* html,
- const std::vector<string16>& labels,
- const std::vector<string16>& names,
- const std::vector<string16>& values,
+ const std::vector<base::string16>& labels,
+ const std::vector<base::string16>& names,
+ const std::vector<base::string16>& values,
const std::vector<std::string>& control_types) {
ASSERT_EQ(labels.size(), names.size());
ASSERT_EQ(labels.size(), values.size());
@@ -140,7 +140,7 @@ class FormAutofillTest : public ChromeRenderViewTest {
}
void ExpectJohnSmithLabels(const char* html) {
- std::vector<string16> labels, names, values;
+ std::vector<base::string16> labels, names, values;
labels.push_back(ASCIIToUTF16("First name:"));
names.push_back(ASCIIToUTF16("firstname"));
@@ -284,7 +284,7 @@ TEST_F(FormAutofillTest, WebFormControlElementToFormField) {
expected.max_length = WebInputElement::defaultMaxLength();
expected.name = ASCIIToUTF16("element");
- expected.value = string16();
+ expected.value = base::string16();
EXPECT_FORM_FIELD_DATA_EQUALS(expected, result1);
FormFieldData result2;
@@ -432,7 +432,7 @@ TEST_F(FormAutofillTest, WebFormControlElementToFormFieldSelect) {
FormFieldData result3;
WebFormControlElementToFormField(element, autofill::EXTRACT_OPTIONS,
&result3);
- expected.value = string16();
+ expected.value = base::string16();
EXPECT_FORM_FIELD_DATA_EQUALS(expected, result3);
ASSERT_EQ(2U, result3.option_values.size());
@@ -1367,7 +1367,7 @@ TEST_F(FormAutofillTest, LabelsInferredFromTableCellTH) {
}
TEST_F(FormAutofillTest, LabelsInferredFromTableCellNested) {
- std::vector<string16> labels, names, values;
+ std::vector<base::string16> labels, names, values;
labels.push_back(ASCIIToUTF16("First name: Bogus"));
names.push_back(ASCIIToUTF16("firstname"));
@@ -1435,7 +1435,7 @@ TEST_F(FormAutofillTest, LabelsInferredFromTableCellNested) {
}
TEST_F(FormAutofillTest, LabelsInferredFromTableEmptyTDs) {
- std::vector<string16> labels, names, values;
+ std::vector<base::string16> labels, names, values;
labels.push_back(ASCIIToUTF16("* First Name"));
names.push_back(ASCIIToUTF16("firstname"));
@@ -1494,7 +1494,7 @@ TEST_F(FormAutofillTest, LabelsInferredFromTableEmptyTDs) {
}
TEST_F(FormAutofillTest, LabelsInferredFromPreviousTD) {
- std::vector<string16> labels, names, values;
+ std::vector<base::string16> labels, names, values;
labels.push_back(ASCIIToUTF16("* First Name"));
names.push_back(ASCIIToUTF16("firstname"));
@@ -1546,7 +1546,7 @@ TEST_F(FormAutofillTest, LabelsInferredFromPreviousTD) {
// inferred.
// Also <!-- comment --> is excluded.
TEST_F(FormAutofillTest, LabelsInferredFromTableWithSpecialElements) {
- std::vector<string16> labels, names, values;
+ std::vector<base::string16> labels, names, values;
std::vector<std::string> control_types;
labels.push_back(ASCIIToUTF16("* First Name"));
@@ -1703,7 +1703,7 @@ TEST_F(FormAutofillTest, LabelsInferredFromTableTDInterveningElements) {
// Verify that we correctly infer labels when the label text spans multiple
// adjacent HTML elements, not separated by whitespace.
TEST_F(FormAutofillTest, LabelsInferredFromTableAdjacentElements) {
- std::vector<string16> labels, names, values;
+ std::vector<base::string16> labels, names, values;
labels.push_back(ASCIIToUTF16("*First Name"));
names.push_back(ASCIIToUTF16("firstname"));
@@ -1757,7 +1757,7 @@ TEST_F(FormAutofillTest, LabelsInferredFromTableAdjacentElements) {
// Verify that we correctly infer labels when the label text resides in the
// previous row.
TEST_F(FormAutofillTest, LabelsInferredFromTableRow) {
- std::vector<string16> labels, names, values;
+ std::vector<base::string16> labels, names, values;
labels.push_back(ASCIIToUTF16("*First Name *Last Name *Email"));
names.push_back(ASCIIToUTF16("firstname"));
@@ -1801,7 +1801,7 @@ TEST_F(FormAutofillTest, LabelsInferredFromTableRow) {
// Verify that we correctly infer labels when enclosed within a list item.
TEST_F(FormAutofillTest, LabelsInferredFromListItem) {
- std::vector<string16> labels, names, values;
+ std::vector<base::string16> labels, names, values;
labels.push_back(ASCIIToUTF16("* Home Phone"));
names.push_back(ASCIIToUTF16("areacode"));
@@ -1836,7 +1836,7 @@ TEST_F(FormAutofillTest, LabelsInferredFromListItem) {
}
TEST_F(FormAutofillTest, LabelsInferredFromDefinitionList) {
- std::vector<string16> labels, names, values;
+ std::vector<base::string16> labels, names, values;
labels.push_back(ASCIIToUTF16("* First name: Bogus"));
names.push_back(ASCIIToUTF16("firstname"));
@@ -1899,19 +1899,19 @@ TEST_F(FormAutofillTest, LabelsInferredFromDefinitionList) {
}
TEST_F(FormAutofillTest, LabelsInferredWithSameName) {
- std::vector<string16> labels, names, values;
+ std::vector<base::string16> labels, names, values;
labels.push_back(ASCIIToUTF16("Address Line 1:"));
names.push_back(ASCIIToUTF16("Address"));
- values.push_back(string16());
+ values.push_back(base::string16());
labels.push_back(ASCIIToUTF16("Address Line 2:"));
names.push_back(ASCIIToUTF16("Address"));
- values.push_back(string16());
+ values.push_back(base::string16());
labels.push_back(ASCIIToUTF16("Address Line 3:"));
names.push_back(ASCIIToUTF16("Address"));
- values.push_back(string16());
+ values.push_back(base::string16());
ExpectLabels(
"<FORM name=\"TestForm\" action=\"http://cnn.com\" method=\"post\">"
@@ -1927,27 +1927,27 @@ TEST_F(FormAutofillTest, LabelsInferredWithSameName) {
}
TEST_F(FormAutofillTest, LabelsInferredWithImageTags) {
- std::vector<string16> labels, names, values;
+ std::vector<base::string16> labels, names, values;
labels.push_back(ASCIIToUTF16("Phone:"));
names.push_back(ASCIIToUTF16("dayphone1"));
- values.push_back(string16());
+ values.push_back(base::string16());
labels.push_back(ASCIIToUTF16("-"));
names.push_back(ASCIIToUTF16("dayphone2"));
- values.push_back(string16());
+ values.push_back(base::string16());
labels.push_back(ASCIIToUTF16("-"));
names.push_back(ASCIIToUTF16("dayphone3"));
- values.push_back(string16());
+ values.push_back(base::string16());
labels.push_back(ASCIIToUTF16("ext.:"));
names.push_back(ASCIIToUTF16("dayphone4"));
- values.push_back(string16());
+ values.push_back(base::string16());
- labels.push_back(string16());
+ labels.push_back(base::string16());
names.push_back(ASCIIToUTF16("dummy"));
- values.push_back(string16());
+ values.push_back(base::string16());
ExpectLabels(
"<FORM name=\"TestForm\" action=\"http://cnn.com\" method=\"post\">"
@@ -2341,7 +2341,7 @@ TEST_F(FormAutofillTest, FillFormEmptyFormNames) {
FormFieldData field;
EXPECT_TRUE(FindFormAndFieldForInputElement(input_element, &form, &field,
autofill::REQUIRE_NONE));
- EXPECT_EQ(string16(), form.name);
+ EXPECT_EQ(base::string16(), form.name);
EXPECT_EQ(GURL(web_frame->document().url()), form.origin);
EXPECT_EQ(GURL("http://abc.com"), form.action);
@@ -2376,7 +2376,7 @@ TEST_F(FormAutofillTest, FillFormEmptyFormNames) {
EXPECT_TRUE(FindFormAndFieldForInputElement(input_element, &form2, &field2,
autofill::REQUIRE_NONE));
- EXPECT_EQ(string16(), form2.name);
+ EXPECT_EQ(base::string16(), form2.name);
EXPECT_EQ(GURL(web_frame->document().url()), form2.origin);
EXPECT_EQ(GURL("http://abc.com"), form2.action);
@@ -2517,13 +2517,13 @@ TEST_F(FormAutofillTest, MaxLengthFields) {
EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields[3]);
// When unspecified |size|, default is returned.
- expected.label = string16();
+ expected.label = base::string16();
expected.name = ASCIIToUTF16("default1");
expected.max_length = WebInputElement::defaultMaxLength();
EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields[4]);
// When invalid |size|, default is returned.
- expected.label = string16();
+ expected.label = base::string16();
expected.name = ASCIIToUTF16("invalid1");
expected.max_length = WebInputElement::defaultMaxLength();
EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields[5]);
@@ -2577,12 +2577,12 @@ TEST_F(FormAutofillTest, FillFormNonEmptyField) {
EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields[0]);
expected.name = ASCIIToUTF16("lastname");
- expected.value = string16();
+ expected.value = base::string16();
expected.is_autofilled = false;
EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields[1]);
expected.name = ASCIIToUTF16("email");
- expected.value = string16();
+ expected.value = base::string16();
expected.is_autofilled = false;
EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields[2]);
@@ -2689,15 +2689,15 @@ TEST_F(FormAutofillTest, ClearFormWithNode) {
expected.max_length = WebInputElement::defaultMaxLength();
expected.name = ASCIIToUTF16("firstname");
- expected.value = string16();
+ expected.value = base::string16();
EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[0]);
expected.name = ASCIIToUTF16("lastname");
- expected.value = string16();
+ expected.value = base::string16();
EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[1]);
expected.name = ASCIIToUTF16("noAC");
- expected.value = string16();
+ expected.value = base::string16();
expected.autocomplete_attribute = "off";
EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[2]);
expected.autocomplete_attribute = std::string(); // reset
@@ -2709,7 +2709,7 @@ TEST_F(FormAutofillTest, ClearFormWithNode) {
expected.form_control_type = "month";
expected.max_length = 0;
expected.name = ASCIIToUTF16("month");
- expected.value = string16();
+ expected.value = base::string16();
EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[4]);
expected.name = ASCIIToUTF16("month-disabled");
@@ -2718,7 +2718,7 @@ TEST_F(FormAutofillTest, ClearFormWithNode) {
expected.form_control_type = "textarea";
expected.name = ASCIIToUTF16("textarea");
- expected.value = string16();
+ expected.value = base::string16();
EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[6]);
expected.name = ASCIIToUTF16("textarea-disabled");
@@ -2726,7 +2726,7 @@ TEST_F(FormAutofillTest, ClearFormWithNode) {
EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[7]);
expected.name = ASCIIToUTF16("textarea-noAC");
- expected.value = string16();
+ expected.value = base::string16();
expected.autocomplete_attribute = "off";
EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[8]);
expected.autocomplete_attribute = std::string(); // reset
@@ -2789,13 +2789,13 @@ TEST_F(FormAutofillTest, ClearFormWithNodeContainingSelectOne) {
FormFieldData expected;
expected.name = ASCIIToUTF16("firstname");
- expected.value = string16();
+ expected.value = base::string16();
expected.form_control_type = "text";
expected.max_length = WebInputElement::defaultMaxLength();
EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[0]);
expected.name = ASCIIToUTF16("lastname");
- expected.value = string16();
+ expected.value = base::string16();
expected.form_control_type = "text";
expected.max_length = WebInputElement::defaultMaxLength();
EXPECT_FORM_FIELD_DATA_EQUALS(expected, fields2[1]);
@@ -3046,7 +3046,7 @@ TEST_F(FormAutofillTest, FormWithNodeIsAutofilled) {
// If we have multiple labels per id, the labels concatenated into label string.
TEST_F(FormAutofillTest, MultipleLabelsPerElement) {
- std::vector<string16> labels, names, values;
+ std::vector<base::string16> labels, names, values;
labels.push_back(ASCIIToUTF16("First Name:"));
names.push_back(ASCIIToUTF16("firstname"));
« no previous file with comments | « chrome/renderer/autofill/autofill_renderer_browsertest.cc ('k') | chrome/renderer/autofill/password_autofill_agent_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698