Index: chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc |
diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc b/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc |
index a6ef0406f1470abf07411f11d52bf338f4b68616..da0dac9b9b7e48deb53f273e47176e28a1243769 100644 |
--- a/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc |
+++ b/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc |
@@ -26,6 +26,7 @@ |
#include "content/public/browser/web_contents.h" |
#include "testing/gmock/include/gmock/gmock.h" |
#include "testing/gtest/include/gtest/gtest.h" |
+#include "ui/accessibility/ax_enums.h" |
#include "ui/gfx/geometry/rect.h" |
#include "ui/gfx/text_utils.h" |
@@ -96,6 +97,7 @@ class TestAutofillPopupController : public AutofillPopupControllerImpl { |
using AutofillPopupControllerImpl::SetValues; |
using AutofillPopupControllerImpl::GetWeakPtr; |
MOCK_METHOD1(InvalidateRow, void(size_t)); |
+ MOCK_METHOD2(NotifyAccessibilityEventForRow, void(ui::AXEvent, size_t)); |
MOCK_METHOD0(UpdateBoundsAndRedrawPopup, void()); |
MOCK_METHOD0(Hide, void()); |
@@ -197,15 +199,21 @@ TEST_F(AutofillPopupControllerUnitTest, RedrawSelectedLine) { |
// be updated to show it is selected. |
int selected_line = 0; |
EXPECT_CALL(*autofill_popup_controller_, InvalidateRow(selected_line)); |
+ EXPECT_CALL(*autofill_popup_controller_, NotifyAccessibilityEventForRow( |
+ ui::AX_EVENT_SELECTION, selected_line)); |
autofill_popup_controller_->SetSelectedLine(selected_line); |
// Ensure that the row isn't invalidated if it didn't change. |
EXPECT_CALL(*autofill_popup_controller_, |
InvalidateRow(selected_line)).Times(0); |
+ EXPECT_CALL(*autofill_popup_controller_, NotifyAccessibilityEventForRow( |
+ _, _)).Times(0); |
autofill_popup_controller_->SetSelectedLine(selected_line); |
// Change back to no selection. |
EXPECT_CALL(*autofill_popup_controller_, InvalidateRow(selected_line)); |
+ EXPECT_CALL(*autofill_popup_controller_, NotifyAccessibilityEventForRow(_, _)) |
+ .Times(0); |
autofill_popup_controller_->SetSelectedLine(-1); |
} |
@@ -254,6 +262,8 @@ TEST_F(AutofillPopupControllerUnitTest, RemoveOnlyLine) { |
// should then be hidden since there are no Autofill entries left. |
EXPECT_CALL(*autofill_popup_controller_, Hide()); |
EXPECT_CALL(*autofill_popup_controller_, InvalidateRow(_)).Times(0); |
+ EXPECT_CALL(*autofill_popup_controller_, NotifyAccessibilityEventForRow(_, _)) |
+ .Times(0); |
EXPECT_TRUE(autofill_popup_controller_->RemoveSelectedLine()); |
} |