| Index: content/browser/accessibility/accessibility_action_browsertest.cc
|
| diff --git a/content/browser/accessibility/accessibility_action_browsertest.cc b/content/browser/accessibility/accessibility_action_browsertest.cc
|
| index 3dc80e82603394c15aed390439c19bc998d827d9..70a7f4fdbb8de260bcba37d565d041693b45400f 100644
|
| --- a/content/browser/accessibility/accessibility_action_browsertest.cc
|
| +++ b/content/browser/accessibility/accessibility_action_browsertest.cc
|
| @@ -79,7 +79,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityActionBrowserTest, FocusAction) {
|
| NavigateToURL(shell(), GURL(url::kAboutBlankURL));
|
|
|
| AccessibilityNotificationWaiter waiter(shell()->web_contents(),
|
| - AccessibilityModeComplete,
|
| + ACCESSIBILITY_MODE_COMPLETE,
|
| ui::AX_EVENT_LOAD_COMPLETE);
|
| GURL url("data:text/html,"
|
| "<button>One</button>"
|
| @@ -92,7 +92,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityActionBrowserTest, FocusAction) {
|
| ASSERT_NE(nullptr, target);
|
|
|
| AccessibilityNotificationWaiter waiter2(shell()->web_contents(),
|
| - AccessibilityModeComplete,
|
| + ACCESSIBILITY_MODE_COMPLETE,
|
| ui::AX_EVENT_FOCUS);
|
| GetManager()->SetFocus(*target);
|
| waiter2.WaitForNotification();
|
| @@ -106,7 +106,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityActionBrowserTest,
|
| NavigateToURL(shell(), GURL(url::kAboutBlankURL));
|
|
|
| AccessibilityNotificationWaiter waiter(shell()->web_contents(),
|
| - AccessibilityModeComplete,
|
| + ACCESSIBILITY_MODE_COMPLETE,
|
| ui::AX_EVENT_LOAD_COMPLETE);
|
| GURL url("data:text/html,"
|
| "<input type=range min=2 value=8 max=10 step=2>");
|
| @@ -120,7 +120,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityActionBrowserTest,
|
| // Increment, should result in value changing from 8 to 10.
|
| {
|
| AccessibilityNotificationWaiter waiter2(shell()->web_contents(),
|
| - AccessibilityModeComplete,
|
| + ACCESSIBILITY_MODE_COMPLETE,
|
| ui::AX_EVENT_VALUE_CHANGED);
|
| GetManager()->Increment(*target);
|
| waiter2.WaitForNotification();
|
| @@ -130,7 +130,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityActionBrowserTest,
|
| // Increment, should result in value staying the same (max).
|
| {
|
| AccessibilityNotificationWaiter waiter2(shell()->web_contents(),
|
| - AccessibilityModeComplete,
|
| + ACCESSIBILITY_MODE_COMPLETE,
|
| ui::AX_EVENT_VALUE_CHANGED);
|
| GetManager()->Increment(*target);
|
| waiter2.WaitForNotification();
|
| @@ -140,7 +140,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityActionBrowserTest,
|
| // Decrement, should result in value changing from 10 to 8.
|
| {
|
| AccessibilityNotificationWaiter waiter2(shell()->web_contents(),
|
| - AccessibilityModeComplete,
|
| + ACCESSIBILITY_MODE_COMPLETE,
|
| ui::AX_EVENT_VALUE_CHANGED);
|
| GetManager()->Decrement(*target);
|
| waiter2.WaitForNotification();
|
| @@ -152,7 +152,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityActionBrowserTest, CanvasGetImage) {
|
| NavigateToURL(shell(), GURL(url::kAboutBlankURL));
|
|
|
| AccessibilityNotificationWaiter waiter(shell()->web_contents(),
|
| - AccessibilityModeComplete,
|
| + ACCESSIBILITY_MODE_COMPLETE,
|
| ui::AX_EVENT_LOAD_COMPLETE);
|
| GURL url("data:text/html,"
|
| "<body>"
|
| @@ -179,7 +179,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityActionBrowserTest, CanvasGetImage) {
|
| ASSERT_NE(nullptr, target);
|
|
|
| AccessibilityNotificationWaiter waiter2(shell()->web_contents(),
|
| - AccessibilityModeComplete,
|
| + ACCESSIBILITY_MODE_COMPLETE,
|
| ui::AX_EVENT_IMAGE_FRAME_UPDATED);
|
| GetManager()->GetImageData(*target, gfx::Size());
|
| waiter2.WaitForNotification();
|
| @@ -202,7 +202,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityActionBrowserTest, CanvasGetImageScale) {
|
| NavigateToURL(shell(), GURL(url::kAboutBlankURL));
|
|
|
| AccessibilityNotificationWaiter waiter(shell()->web_contents(),
|
| - AccessibilityModeComplete,
|
| + ACCESSIBILITY_MODE_COMPLETE,
|
| ui::AX_EVENT_LOAD_COMPLETE);
|
| GURL url("data:text/html,"
|
| "<body>"
|
| @@ -223,7 +223,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityActionBrowserTest, CanvasGetImageScale) {
|
| ASSERT_NE(nullptr, target);
|
|
|
| AccessibilityNotificationWaiter waiter2(shell()->web_contents(),
|
| - AccessibilityModeComplete,
|
| + ACCESSIBILITY_MODE_COMPLETE,
|
| ui::AX_EVENT_IMAGE_FRAME_UPDATED);
|
| GetManager()->GetImageData(*target, gfx::Size(4, 4));
|
| waiter2.WaitForNotification();
|
| @@ -246,7 +246,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityActionBrowserTest, ImgElementGetImage) {
|
| NavigateToURL(shell(), GURL(url::kAboutBlankURL));
|
|
|
| AccessibilityNotificationWaiter waiter(shell()->web_contents(),
|
| - AccessibilityModeComplete,
|
| + ACCESSIBILITY_MODE_COMPLETE,
|
| ui::AX_EVENT_LOAD_COMPLETE);
|
| GURL url("data:text/html,"
|
| "<body>"
|
| @@ -261,7 +261,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityActionBrowserTest, ImgElementGetImage) {
|
| ASSERT_NE(nullptr, target);
|
|
|
| AccessibilityNotificationWaiter waiter2(shell()->web_contents(),
|
| - AccessibilityModeComplete,
|
| + ACCESSIBILITY_MODE_COMPLETE,
|
| ui::AX_EVENT_IMAGE_FRAME_UPDATED);
|
| GetManager()->GetImageData(*target, gfx::Size());
|
| waiter2.WaitForNotification();
|
|
|