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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 6437001: Pull in a named constant from WebKit (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Namespace. Created 9 years, 10 months 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/browser/autofill/autofill_merge_unittest.cc ('k') | chrome/renderer/render_view_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/autofill/form_manager_browsertest.cc
diff --git a/chrome/renderer/autofill/form_manager_browsertest.cc b/chrome/renderer/autofill/form_manager_browsertest.cc
index 3e7fc9fa2b4b62fcad60f735a2acdc753ecf261c..30f7892e3d4b4352409815329bc4a36d5cd7cfce 100644
--- a/chrome/renderer/autofill/form_manager_browsertest.cc
+++ b/chrome/renderer/autofill/form_manager_browsertest.cc
@@ -38,13 +38,6 @@ using autofill::FormManager;
using webkit_glue::FormData;
using webkit_glue::FormField;
-namespace {
-
-// TODO(isherman): Pull this as a named constant from WebKit
-const int kDefaultMaxLength = 0x80000;
-
-} // namespace
-
class FormManagerTest : public RenderViewTest {
public:
FormManagerTest() : RenderViewTest() {}
@@ -82,7 +75,7 @@ class FormManagerTest : public RenderViewTest {
names[i],
values[i],
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false);
EXPECT_TRUE(fields[i].StrictlyEqualsHack(expected))
<< "Expected \"" << expected << "\", got \"" << fields[i] << "\"";
@@ -107,6 +100,12 @@ class FormManagerTest : public RenderViewTest {
ExpectLabels(html, labels, names, values);
}
+ // Declared as a function rather than a constant to make sure that
+ // initialization order works out correctly.
+ static int kDefaultMaxLength() {
dhollowa 2011/02/11 17:14:32 Actually, let's just get rid of this function and
Ilya Sherman 2011/02/11 21:34:00 Done.
+ return WebInputElement::defaultMaxLength();
+ }
+
private:
DISALLOW_COPY_AND_ASSIGN(FormManagerTest);
@@ -129,7 +128,7 @@ TEST_F(FormManagerTest, WebFormControlElementToFormField) {
ASCIIToUTF16("element"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false)));
FormField result2;
FormManager::WebFormControlElementToFormField(element,
@@ -139,7 +138,7 @@ TEST_F(FormManagerTest, WebFormControlElementToFormField) {
ASCIIToUTF16("element"),
ASCIIToUTF16("value"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false)));
}
@@ -161,7 +160,7 @@ TEST_F(FormManagerTest, WebFormControlElementToFormFieldAutocompleteOff) {
ASCIIToUTF16("element"),
ASCIIToUTF16("value"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false)));
}
@@ -205,7 +204,7 @@ TEST_F(FormManagerTest, WebFormControlElementToFormFieldAutofilled) {
ASCIIToUTF16("element"),
ASCIIToUTF16("value"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
true)));
}
@@ -370,14 +369,14 @@ TEST_F(FormManagerTest, WebFormElementToFormData) {
ASCIIToUTF16("firstname"),
ASCIIToUTF16("John"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false)));
EXPECT_TRUE(fields[1].StrictlyEqualsHack(
FormField(string16(),
ASCIIToUTF16("lastname"),
ASCIIToUTF16("Smith"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false)));
EXPECT_TRUE(fields[2].StrictlyEqualsHack(
FormField(string16(),
@@ -417,21 +416,21 @@ TEST_F(FormManagerTest, ExtractForms) {
ASCIIToUTF16("firstname"),
ASCIIToUTF16("John"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[0]);
EXPECT_EQ(FormField(string16(),
ASCIIToUTF16("lastname"),
ASCIIToUTF16("Smith"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[1]);
EXPECT_EQ(FormField(string16(),
ASCIIToUTF16("email"),
ASCIIToUTF16("john@example.com"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[2]);
}
@@ -472,21 +471,21 @@ TEST_F(FormManagerTest, ExtractMultipleForms) {
ASCIIToUTF16("firstname"),
ASCIIToUTF16("John"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[0]);
EXPECT_EQ(FormField(string16(),
ASCIIToUTF16("lastname"),
ASCIIToUTF16("Smith"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[1]);
EXPECT_EQ(FormField(string16(),
ASCIIToUTF16("email"),
ASCIIToUTF16("john@example.com"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[2]);
@@ -502,21 +501,21 @@ TEST_F(FormManagerTest, ExtractMultipleForms) {
ASCIIToUTF16("firstname"),
ASCIIToUTF16("Jack"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields2[0]);
EXPECT_EQ(FormField(string16(),
ASCIIToUTF16("lastname"),
ASCIIToUTF16("Adams"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields2[1]);
EXPECT_EQ(FormField(string16(),
ASCIIToUTF16("email"),
ASCIIToUTF16("jack@example.com"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[2]);
}
@@ -599,21 +598,21 @@ TEST_F(FormManagerTest, GetFormsAutocomplete) {
ASCIIToUTF16("middlename"),
ASCIIToUTF16("Jack"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[0]);
EXPECT_EQ(FormField(string16(),
ASCIIToUTF16("lastname"),
ASCIIToUTF16("Smith"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[1]);
EXPECT_EQ(FormField(string16(),
ASCIIToUTF16("email"),
ASCIIToUTF16("john@example.com"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[2]);
}
@@ -649,21 +648,21 @@ TEST_F(FormManagerTest, GetFormsElementsEnabled) {
ASCIIToUTF16("middlename"),
ASCIIToUTF16("Jack"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[0]);
EXPECT_EQ(FormField(string16(),
ASCIIToUTF16("lastname"),
ASCIIToUTF16("Smith"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[1]);
EXPECT_EQ(FormField(string16(),
ASCIIToUTF16("email"),
ASCIIToUTF16("jack@example.com"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[2]);
}
@@ -705,21 +704,21 @@ TEST_F(FormManagerTest, FindForm) {
ASCIIToUTF16("firstname"),
ASCIIToUTF16("John"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[0]);
EXPECT_EQ(FormField(string16(),
ASCIIToUTF16("lastname"),
ASCIIToUTF16("Smith"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[1]);
EXPECT_EQ(FormField(string16(),
ASCIIToUTF16("email"),
ASCIIToUTF16("john@example.com"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[2]);
}
@@ -764,35 +763,35 @@ TEST_F(FormManagerTest, FillForm) {
ASCIIToUTF16("firstname"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[0]);
EXPECT_EQ(FormField(string16(),
ASCIIToUTF16("lastname"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[1]);
EXPECT_EQ(FormField(string16(),
ASCIIToUTF16("notempty"),
ASCIIToUTF16("Hi"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[2]);
EXPECT_EQ(FormField(string16(),
ASCIIToUTF16("noautocomplete"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[3]);
EXPECT_EQ(FormField(string16(),
ASCIIToUTF16("notenabled"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[4]);
@@ -876,35 +875,35 @@ TEST_F(FormManagerTest, PreviewForm) {
ASCIIToUTF16("firstname"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[0]);
EXPECT_EQ(FormField(string16(),
ASCIIToUTF16("lastname"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[1]);
EXPECT_EQ(FormField(string16(),
ASCIIToUTF16("notempty"),
ASCIIToUTF16("Hi"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[2]);
EXPECT_EQ(FormField(string16(),
ASCIIToUTF16("noautocomplete"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[3]);
EXPECT_EQ(FormField(string16(),
ASCIIToUTF16("notenabled"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[4]);
@@ -1563,21 +1562,21 @@ TEST_F(FormManagerTest, FillFormNegativeMaxLength) {
ASCIIToUTF16("firstname"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[0]);
EXPECT_EQ(FormField(string16(),
ASCIIToUTF16("lastname"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[1]);
EXPECT_EQ(FormField(string16(),
ASCIIToUTF16("email"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[2]);
@@ -1602,21 +1601,21 @@ TEST_F(FormManagerTest, FillFormNegativeMaxLength) {
ASCIIToUTF16("firstname"),
ASCIIToUTF16("Brother"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false)));
EXPECT_TRUE(fields2[1].StrictlyEqualsHack(
FormField(string16(),
ASCIIToUTF16("lastname"),
ASCIIToUTF16("Jonathan"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false)));
EXPECT_TRUE(fields2[2].StrictlyEqualsHack(
FormField(string16(),
ASCIIToUTF16("email"),
ASCIIToUTF16("brotherj@example.com"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false)));
}
@@ -1656,7 +1655,7 @@ TEST_F(FormManagerTest, FillFormMoreFormDataFields) {
ASCIIToUTF16("prefix"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false);
form->fields.insert(form->fields.begin(), field1);
@@ -1664,7 +1663,7 @@ TEST_F(FormManagerTest, FillFormMoreFormDataFields) {
ASCIIToUTF16("hidden"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false);
form->fields.insert(form->fields.begin() + 2, field2);
@@ -1672,7 +1671,7 @@ TEST_F(FormManagerTest, FillFormMoreFormDataFields) {
ASCIIToUTF16("second"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false);
form->fields.insert(form->fields.begin() + 4, field3);
@@ -1680,7 +1679,7 @@ TEST_F(FormManagerTest, FillFormMoreFormDataFields) {
ASCIIToUTF16("postfix"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false);
form->fields.insert(form->fields.begin() + 6, field4);
@@ -1712,19 +1711,19 @@ TEST_F(FormManagerTest, FillFormMoreFormDataFields) {
ASCIIToUTF16("firstname"),
ASCIIToUTF16("Brother"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false)));
EXPECT_TRUE(fields[1].StrictlyEqualsHack(FormField(string16(),
ASCIIToUTF16("middlename"),
ASCIIToUTF16("Joseph"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false)));
EXPECT_TRUE(fields[2].StrictlyEqualsHack(FormField(string16(),
ASCIIToUTF16("lastname"),
ASCIIToUTF16("Jonathan"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false)));
}
@@ -1788,43 +1787,43 @@ TEST_F(FormManagerTest, FillFormFewerFormDataFields) {
ASCIIToUTF16("prefix"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false)));
EXPECT_TRUE(fields[1].StrictlyEqualsHack(FormField(string16(),
ASCIIToUTF16("firstname"),
ASCIIToUTF16("Brother"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false)));
EXPECT_TRUE(fields[2].StrictlyEqualsHack(FormField(string16(),
ASCIIToUTF16("hidden"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false)));
EXPECT_TRUE(fields[3].StrictlyEqualsHack(FormField(string16(),
ASCIIToUTF16("middlename"),
ASCIIToUTF16("Joseph"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false)));
EXPECT_TRUE(fields[4].StrictlyEqualsHack(FormField(string16(),
ASCIIToUTF16("second"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false)));
EXPECT_TRUE(fields[5].StrictlyEqualsHack(FormField(string16(),
ASCIIToUTF16("lastname"),
ASCIIToUTF16("Jonathan"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false)));
EXPECT_TRUE(fields[6].StrictlyEqualsHack(FormField(string16(),
ASCIIToUTF16("postfix"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false)));
}
@@ -1885,19 +1884,19 @@ TEST_F(FormManagerTest, FillFormChangedFormDataFields) {
ASCIIToUTF16("firstname"),
ASCIIToUTF16("Brother"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false)));
EXPECT_TRUE(fields[1].StrictlyEqualsHack(FormField(string16(),
ASCIIToUTF16("middlename"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false)));
EXPECT_TRUE(fields[2].StrictlyEqualsHack(FormField(string16(),
ASCIIToUTF16("lastname"),
ASCIIToUTF16("Jonathan"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false)));
}
@@ -1955,25 +1954,25 @@ TEST_F(FormManagerTest, FillFormExtraFieldInCache) {
ASCIIToUTF16("firstname"),
ASCIIToUTF16("Brother"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false)));
EXPECT_TRUE(fields[1].StrictlyEqualsHack(FormField(string16(),
ASCIIToUTF16("middlename"),
ASCIIToUTF16("Joseph"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false)));
EXPECT_TRUE(fields[2].StrictlyEqualsHack(FormField(string16(),
ASCIIToUTF16("lastname"),
ASCIIToUTF16("Jonathan"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false)));
EXPECT_TRUE(fields[3].StrictlyEqualsHack(FormField(string16(),
ASCIIToUTF16("postfix"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false)));
}
@@ -2014,21 +2013,21 @@ TEST_F(FormManagerTest, FillFormEmptyName) {
ASCIIToUTF16("firstname"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[0]);
EXPECT_EQ(FormField(string16(),
ASCIIToUTF16("lastname"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[1]);
EXPECT_EQ(FormField(string16(),
ASCIIToUTF16("email"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[2]);
@@ -2052,21 +2051,21 @@ TEST_F(FormManagerTest, FillFormEmptyName) {
ASCIIToUTF16("firstname"),
ASCIIToUTF16("Wyatt"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields2[0]);
EXPECT_EQ(FormField(string16(),
ASCIIToUTF16("lastname"),
ASCIIToUTF16("Earp"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields2[1]);
EXPECT_EQ(FormField(string16(),
ASCIIToUTF16("email"),
ASCIIToUTF16("wyatt@example.com"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields2[2]);
}
@@ -2114,21 +2113,21 @@ TEST_F(FormManagerTest, FillFormEmptyFormNames) {
ASCIIToUTF16("apple"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[0]);
EXPECT_EQ(FormField(string16(),
ASCIIToUTF16("banana"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[1]);
EXPECT_EQ(FormField(string16(),
ASCIIToUTF16("cantelope"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[2]);
@@ -2152,21 +2151,21 @@ TEST_F(FormManagerTest, FillFormEmptyFormNames) {
ASCIIToUTF16("apple"),
ASCIIToUTF16("Red"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields2[0]);
EXPECT_EQ(FormField(string16(),
ASCIIToUTF16("banana"),
ASCIIToUTF16("Yellow"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields2[1]);
EXPECT_EQ(FormField(string16(),
ASCIIToUTF16("cantelope"),
ASCIIToUTF16("Also Yellow"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields2[2]);
}
@@ -2207,28 +2206,28 @@ TEST_F(FormManagerTest, ThreePartPhone) {
ASCIIToUTF16("dayphone1"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[0]);
EXPECT_EQ(FormField(ASCIIToUTF16("-"),
ASCIIToUTF16("dayphone2"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[1]);
EXPECT_EQ(FormField(ASCIIToUTF16("-"),
ASCIIToUTF16("dayphone3"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[2]);
EXPECT_EQ(FormField(ASCIIToUTF16("ext.:"),
ASCIIToUTF16("dayphone4"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[3]);
}
@@ -2301,7 +2300,7 @@ TEST_F(FormManagerTest, MaxLengthFields) {
ASCIIToUTF16("default1"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[4]);
// When invalid |size|, default is returned.
@@ -2309,7 +2308,7 @@ TEST_F(FormManagerTest, MaxLengthFields) {
ASCIIToUTF16("invalid1"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[5]);
}
@@ -2357,21 +2356,21 @@ TEST_F(FormManagerTest, FillFormNonEmptyField) {
ASCIIToUTF16("firstname"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[0]);
EXPECT_EQ(FormField(string16(),
ASCIIToUTF16("lastname"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[1]);
EXPECT_EQ(FormField(string16(),
ASCIIToUTF16("email"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields[2]);
@@ -2395,21 +2394,21 @@ TEST_F(FormManagerTest, FillFormNonEmptyField) {
ASCIIToUTF16("firstname"),
ASCIIToUTF16("Wyatt"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields2[0]);
EXPECT_EQ(FormField(string16(),
ASCIIToUTF16("lastname"),
ASCIIToUTF16("Earp"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields2[1]);
EXPECT_EQ(FormField(string16(),
ASCIIToUTF16("email"),
ASCIIToUTF16("wyatt@example.com"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false),
fields2[2]);
@@ -2470,28 +2469,28 @@ TEST_F(FormManagerTest, ClearFormWithNode) {
ASCIIToUTF16("firstname"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false)));
EXPECT_TRUE(fields2[1].StrictlyEqualsHack(
FormField(string16(),
ASCIIToUTF16("lastname"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false)));
EXPECT_TRUE(fields2[2].StrictlyEqualsHack(
FormField(string16(),
ASCIIToUTF16("noAC"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false)));
EXPECT_TRUE(fields2[3].StrictlyEqualsHack(
FormField(string16(),
ASCIIToUTF16("notenabled"),
ASCIIToUTF16("no clear"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false)));
// Verify that the cursor position has been updated.
@@ -2555,14 +2554,14 @@ TEST_F(FormManagerTest, ClearFormWithNodeContainingSelectOne) {
ASCIIToUTF16("firstname"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false)));
EXPECT_TRUE(fields2[1].StrictlyEqualsHack(
FormField(string16(),
ASCIIToUTF16("lastname"),
string16(),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false)));
EXPECT_TRUE(fields2[2].StrictlyEqualsHack(
FormField(string16(),
@@ -2885,14 +2884,14 @@ TEST_F(FormManagerTest, SelectOneAsText) {
ASCIIToUTF16("firstname"),
ASCIIToUTF16("John"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false)));
EXPECT_TRUE(fields[1].StrictlyEqualsHack(
FormField(string16(),
ASCIIToUTF16("lastname"),
ASCIIToUTF16("Smith"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false)));
EXPECT_TRUE(fields[2].StrictlyEqualsHack(
FormField(string16(),
@@ -2918,14 +2917,14 @@ TEST_F(FormManagerTest, SelectOneAsText) {
ASCIIToUTF16("firstname"),
ASCIIToUTF16("John"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false)));
EXPECT_TRUE(fields[1].StrictlyEqualsHack(
FormField(string16(),
ASCIIToUTF16("lastname"),
ASCIIToUTF16("Smith"),
ASCIIToUTF16("text"),
- kDefaultMaxLength,
+ kDefaultMaxLength(),
false)));
EXPECT_TRUE(fields[2].StrictlyEqualsHack(
FormField(string16(),
« no previous file with comments | « chrome/browser/autofill/autofill_merge_unittest.cc ('k') | chrome/renderer/render_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698