Chromium Code Reviews| Index: chrome/browser/autofill/autofill_manager_unittest.cc |
| diff --git a/chrome/browser/autofill/autofill_manager_unittest.cc b/chrome/browser/autofill/autofill_manager_unittest.cc |
| index 2b7100b45b33766a2eb9c20c314d8d1ed7ae5777..8935e4c3934624f3a028917c9081dc8f24b40e4a 100644 |
| --- a/chrome/browser/autofill/autofill_manager_unittest.cc |
| +++ b/chrome/browser/autofill/autofill_manager_unittest.cc |
| @@ -461,7 +461,6 @@ class TestAutofillManager : public AutofillManager { |
| : AutofillManager(web_contents, delegate, personal_data), |
| personal_data_(personal_data), |
| autofill_enabled_(true), |
| - request_autocomplete_error_count_(0), |
| did_finish_async_form_submit_(false), |
| message_loop_is_running_(false) { |
| } |
| @@ -472,10 +471,13 @@ class TestAutofillManager : public AutofillManager { |
| autofill_enabled_ = autofill_enabled; |
| } |
| - int request_autocomplete_error_count() const { |
| - return request_autocomplete_error_count_; |
| + const |
| + std::vector<std::pair<WebKit::WebFormElement::AutocompleteResult, FormData> >& |
|
Ilya Sherman
2013/01/11 20:59:56
nit: Maybe use "using WebKit::WebFormElement" or a
Dan Beam
2013/01/11 21:50:15
Done.
|
| + request_autocomplete_results() const { |
| + return request_autocomplete_results_; |
| } |
| + |
| void set_expected_submitted_field_types( |
| const std::vector<FieldTypeSet>& expected_types) { |
| expected_submitted_field_types_ = expected_types; |
| @@ -580,8 +582,10 @@ class TestAutofillManager : public AutofillManager { |
| form_structures()->push_back(form); |
| } |
| - virtual void ReturnAutocompleteError() OVERRIDE { |
| - ++request_autocomplete_error_count_; |
| + virtual void ReturnAutocompleteResult( |
| + WebKit::WebFormElement::AutocompleteResult result, |
| + const FormData& form_data) OVERRIDE { |
| + request_autocomplete_results_.push_back(std::make_pair(result, form_data)); |
| } |
| private: |
| @@ -592,7 +596,8 @@ class TestAutofillManager : public AutofillManager { |
| TestPersonalDataManager* personal_data_; |
| bool autofill_enabled_; |
| - int request_autocomplete_error_count_; |
| + std::vector<std::pair<WebKit::WebFormElement::AutocompleteResult, FormData> > |
| + request_autocomplete_results_; |
| bool did_finish_async_form_submit_; |
| bool message_loop_is_running_; |
| @@ -3188,14 +3193,16 @@ TEST_F(AutofillManagerTest, RemoveProfileVariant) { |
| } |
| TEST_F(AutofillManagerTest, DisabledAutofillDispatchesError) { |
| - ASSERT_EQ(0, autofill_manager_->request_autocomplete_error_count()); |
| + EXPECT_TRUE(autofill_manager_->request_autocomplete_results().empty()); |
| autofill_manager_->set_autofill_enabled(false); |
| autofill_manager_->OnRequestAutocomplete(FormData(), |
| GURL(), |
| content::SSLStatus()); |
| - EXPECT_EQ(1, autofill_manager_->request_autocomplete_error_count()); |
| + EXPECT_EQ(1U, autofill_manager_->request_autocomplete_results().size()); |
| + EXPECT_EQ(WebKit::WebFormElement::AutocompleteResultErrorDisabled, |
| + autofill_manager_->request_autocomplete_results()[0].first); |
| } |
| namespace { |