Index: components/autofill/core/browser/autofill_external_delegate_unittest.cc |
diff --git a/components/autofill/core/browser/autofill_external_delegate_unittest.cc b/components/autofill/core/browser/autofill_external_delegate_unittest.cc |
index d7b673f0db9f9dbc60f4c99be561e497381344ca..7ba29300b5c95d8dfe3b7a2f1e653df336069a00 100644 |
--- a/components/autofill/core/browser/autofill_external_delegate_unittest.cc |
+++ b/components/autofill/core/browser/autofill_external_delegate_unittest.cc |
@@ -44,7 +44,9 @@ class MockAutofillDriver : public TestAutofillDriver { |
void(const base::string16&)); |
MOCK_METHOD0(RendererShouldClearFilledForm, void()); |
MOCK_METHOD0(RendererShouldClearPreviewedForm, void()); |
- MOCK_METHOD1(RendererShouldSetNodeText, void(const base::string16&)); |
+ MOCK_METHOD1(RendererShouldFillFieldWithValue, void(const base::string16&)); |
+ MOCK_METHOD1(RendererShouldPreviewFieldWithValue, |
+ void(const base::string16&)); |
private: |
DISALLOW_COPY_AND_ASSIGN(MockAutofillDriver); |
@@ -361,7 +363,7 @@ TEST_F(AutofillExternalDelegateUnitTest, ExternalDelegateInvalidUniqueId) { |
EXPECT_CALL(*autofill_driver_, |
SetRendererActionOnFormDataReception(_)).Times(0); |
EXPECT_CALL(*autofill_driver_, RendererShouldClearPreviewedForm()).Times(1); |
- external_delegate_->DidSelectSuggestion(-1); |
+ external_delegate_->DidSelectSuggestion(base::string16(), -1); |
// Ensure it doesn't try to fill the form in with the negative id. |
EXPECT_CALL(manager_delegate_, HideAutofillPopup()); |
@@ -380,11 +382,18 @@ TEST_F(AutofillExternalDelegateUnitTest, ExternalDelegateClearPreviewedForm) { |
// Ensure selecting a new password entries or Autofill entries will |
// cause any previews to get cleared. |
EXPECT_CALL(*autofill_driver_, RendererShouldClearPreviewedForm()).Times(1); |
- external_delegate_->DidSelectSuggestion(POPUP_ITEM_ID_PASSWORD_ENTRY); |
+ external_delegate_->DidSelectSuggestion(ASCIIToUTF16("baz foo"), |
+ POPUP_ITEM_ID_PASSWORD_ENTRY); |
EXPECT_CALL(*autofill_driver_, RendererShouldClearPreviewedForm()).Times(1); |
EXPECT_CALL(*autofill_driver_, SetRendererActionOnFormDataReception( |
AutofillDriver::FORM_DATA_ACTION_PREVIEW)); |
- external_delegate_->DidSelectSuggestion(1); |
+ external_delegate_->DidSelectSuggestion(ASCIIToUTF16("baz foo"), 1); |
+ |
+ // Ensure selecting an autocomplete entries will cause any previews to |
Ilya Sherman
2014/03/01 02:57:37
nit: "an autocomplete entries" -> "an autocomplete
ziran.sun
2014/03/04 15:30:19
Done.
|
+ // get cleared. |
+ EXPECT_CALL(*autofill_driver_, RendererShouldClearPreviewedForm()).Times(1); |
+ external_delegate_->DidSelectSuggestion(ASCIIToUTF16("baz foo"), |
+ POPUP_ITEM_ID_AUTOCOMPLETE_ENTRY); |
} |
// Test that the popup is hidden once we are done editing the autofill field. |
@@ -490,11 +499,11 @@ TEST_F(AutofillExternalDelegateUnitTest, ExternalDelegateHideWarning) { |
autofill_ids); |
} |
-TEST_F(AutofillExternalDelegateUnitTest, ExternalDelegateSetNodeText) { |
+TEST_F(AutofillExternalDelegateUnitTest, ExternalDelegateFillFieldWithValue) { |
EXPECT_CALL(manager_delegate_, HideAutofillPopup()); |
base::string16 dummy_string(ASCIIToUTF16("baz foo")); |
EXPECT_CALL(*autofill_driver_, |
- RendererShouldSetNodeText(dummy_string)); |
+ RendererShouldFillFieldWithValue(dummy_string)); |
external_delegate_->DidAcceptSuggestion(dummy_string, |
POPUP_ITEM_ID_AUTOCOMPLETE_ENTRY); |
} |