Merge from Chromium at DEPS revision 228962
This commit was generated by merge_to_master.py.
Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea
diff --git a/chrome/browser/ui/cocoa/autofill/autofill_section_container_unittest.mm b/chrome/browser/ui/cocoa/autofill/autofill_section_container_unittest.mm
index 6b79aa2..d364093 100644
--- a/chrome/browser/ui/cocoa/autofill/autofill_section_container_unittest.mm
+++ b/chrome/browser/ui/cocoa/autofill/autofill_section_container_unittest.mm
@@ -218,10 +218,12 @@
inputs.push_back(kTestInputs[1]);
DetailOutputMap output;
- ValidityData validity, validity2;
+ ValidityMessages validity, validity2;
- validity[EMAIL_ADDRESS] = ASCIIToUTF16("Some error message");
- validity2[CREDIT_CARD_EXP_MONTH ] = ASCIIToUTF16("Some other error message");
+ validity.Set(EMAIL_ADDRESS,
+ ValidityMessage(ASCIIToUTF16("Some error message"), false));
+ validity2.Set(CREDIT_CARD_EXP_MONTH,
+ ValidityMessage(ASCIIToUTF16("Some other error message"), false));
EXPECT_CALL(delegate_, RequestedFieldsForSection(section_))
.WillOnce(ReturnRef(inputs));
EXPECT_CALL(delegate_, ComboboxModelForAutofillType(EMAIL_ADDRESS))
@@ -231,7 +233,7 @@
ResetContainer();
[container_ getInputs:&output];
- EXPECT_CALL(delegate_, InputsAreValid(section_, output, VALIDATE_FINAL))
+ EXPECT_CALL(delegate_, InputsAreValid(section_, output))
.WillOnce(Return(validity))
.WillOnce(Return(validity2));
@@ -241,7 +243,6 @@
field = [container_ getField:CREDIT_CARD_EXP_MONTH];
EXPECT_FALSE([field invalid]);
-
[container_ validateFor:VALIDATE_FINAL];
field = [container_ getField:EMAIL_ADDRESS];
EXPECT_FALSE([field invalid]);