| Index: chrome/browser/accessibility/accessibility_win_browsertest.cc
|
| ===================================================================
|
| --- chrome/browser/accessibility/accessibility_win_browsertest.cc (revision 147577)
|
| +++ chrome/browser/accessibility/accessibility_win_browsertest.cc (working copy)
|
| @@ -398,7 +398,7 @@
|
|
|
| IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
|
| TestRendererAccessibilityTree) {
|
| - ui_test_utils::WindowedNotificationObserver tree_updated_observer1(
|
| + content::WindowedNotificationObserver tree_updated_observer1(
|
| content::NOTIFICATION_RENDER_VIEW_HOST_ACCESSIBILITY_TREE_UPDATED,
|
| content::NotificationService::AllSources());
|
|
|
| @@ -416,7 +416,7 @@
|
| STATE_SYSTEM_READONLY | STATE_SYSTEM_FOCUSABLE | STATE_SYSTEM_FOCUSED);
|
| document1_checker.CheckAccessible(GetRendererAccessible());
|
|
|
| - ui_test_utils::WindowedNotificationObserver tree_updated_observer2(
|
| + content::WindowedNotificationObserver tree_updated_observer2(
|
| content::NOTIFICATION_RENDER_VIEW_HOST_ACCESSIBILITY_TREE_UPDATED,
|
| content::NotificationService::AllSources());
|
| GURL tree_url(
|
| @@ -460,7 +460,7 @@
|
|
|
| IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
|
| TestNotificationActiveDescendantChanged) {
|
| - ui_test_utils::WindowedNotificationObserver tree_updated_observer1(
|
| + content::WindowedNotificationObserver tree_updated_observer1(
|
| content::NOTIFICATION_RENDER_VIEW_HOST_ACCESSIBILITY_TREE_UPDATED,
|
| content::NotificationService::AllSources());
|
| GURL tree_url("data:text/html,<ul tabindex='-1' role='radiogroup'><li id='li'"
|
| @@ -488,7 +488,7 @@
|
| document_checker.CheckAccessible(GetRendererAccessible());
|
|
|
| // Set focus to the radio group.
|
| - ui_test_utils::WindowedNotificationObserver tree_updated_observer2(
|
| + content::WindowedNotificationObserver tree_updated_observer2(
|
| content::NOTIFICATION_RENDER_VIEW_HOST_ACCESSIBILITY_TREE_UPDATED,
|
| content::NotificationService::AllSources());
|
| ExecuteScript(L"document.body.children[0].focus()");
|
| @@ -500,7 +500,7 @@
|
| document_checker.CheckAccessible(GetRendererAccessible());
|
|
|
| // Set the active descendant of the radio group
|
| - ui_test_utils::WindowedNotificationObserver tree_updated_observer3(
|
| + content::WindowedNotificationObserver tree_updated_observer3(
|
| content::NOTIFICATION_RENDER_VIEW_HOST_ACCESSIBILITY_TREE_UPDATED,
|
| content::NotificationService::AllSources());
|
| ExecuteScript(
|
| @@ -516,7 +516,7 @@
|
|
|
| IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
|
| TestNotificationCheckedStateChanged) {
|
| - ui_test_utils::WindowedNotificationObserver tree_updated_observer1(
|
| + content::WindowedNotificationObserver tree_updated_observer1(
|
| content::NOTIFICATION_RENDER_VIEW_HOST_ACCESSIBILITY_TREE_UPDATED,
|
| content::NotificationService::AllSources());
|
| GURL tree_url("data:text/html,<body><input type='checkbox' /></body>");
|
| @@ -536,7 +536,7 @@
|
| document_checker.CheckAccessible(GetRendererAccessible());
|
|
|
| // Check the checkbox.
|
| - ui_test_utils::WindowedNotificationObserver tree_updated_observer2(
|
| + content::WindowedNotificationObserver tree_updated_observer2(
|
| content::NOTIFICATION_RENDER_VIEW_HOST_ACCESSIBILITY_TREE_UPDATED,
|
| content::NotificationService::AllSources());
|
| ExecuteScript(L"document.body.children[0].checked=true");
|
| @@ -550,7 +550,7 @@
|
|
|
| IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
|
| TestNotificationChildrenChanged) {
|
| - ui_test_utils::WindowedNotificationObserver tree_updated_observer1(
|
| + content::WindowedNotificationObserver tree_updated_observer1(
|
| content::NOTIFICATION_RENDER_VIEW_HOST_ACCESSIBILITY_TREE_UPDATED,
|
| content::NotificationService::AllSources());
|
| // The role attribute causes the node to be in the accessibility tree.
|
| @@ -569,7 +569,7 @@
|
| document_checker.CheckAccessible(GetRendererAccessible());
|
|
|
| // Change the children of the document body.
|
| - ui_test_utils::WindowedNotificationObserver tree_updated_observer2(
|
| + content::WindowedNotificationObserver tree_updated_observer2(
|
| content::NOTIFICATION_RENDER_VIEW_HOST_ACCESSIBILITY_TREE_UPDATED,
|
| content::NotificationService::AllSources());
|
| ExecuteScript(L"document.body.innerHTML='<b>new text</b>'");
|
| @@ -583,7 +583,7 @@
|
|
|
| IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
|
| TestNotificationChildrenChanged2) {
|
| - ui_test_utils::WindowedNotificationObserver tree_updated_observer1(
|
| + content::WindowedNotificationObserver tree_updated_observer1(
|
| content::NOTIFICATION_RENDER_VIEW_HOST_ACCESSIBILITY_TREE_UPDATED,
|
| content::NotificationService::AllSources());
|
| // The role attribute causes the node to be in the accessibility tree.
|
| @@ -601,7 +601,7 @@
|
| document_checker.CheckAccessible(GetRendererAccessible());
|
|
|
| // Change the children of the document body.
|
| - ui_test_utils::WindowedNotificationObserver tree_updated_observer2(
|
| + content::WindowedNotificationObserver tree_updated_observer2(
|
| content::NOTIFICATION_RENDER_VIEW_HOST_ACCESSIBILITY_TREE_UPDATED,
|
| content::NotificationService::AllSources());
|
| ExecuteScript(L"document.body.children[0].style.visibility='visible'");
|
| @@ -617,7 +617,7 @@
|
|
|
| IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
|
| TestNotificationFocusChanged) {
|
| - ui_test_utils::WindowedNotificationObserver tree_updated_observer1(
|
| + content::WindowedNotificationObserver tree_updated_observer1(
|
| content::NOTIFICATION_RENDER_VIEW_HOST_ACCESSIBILITY_TREE_UPDATED,
|
| content::NotificationService::AllSources());
|
| // The role attribute causes the node to be in the accessibility tree.
|
| @@ -639,7 +639,7 @@
|
| document_checker.CheckAccessible(GetRendererAccessible());
|
|
|
| // Focus the div in the document
|
| - ui_test_utils::WindowedNotificationObserver tree_updated_observer2(
|
| + content::WindowedNotificationObserver tree_updated_observer2(
|
| content::NOTIFICATION_RENDER_VIEW_HOST_ACCESSIBILITY_TREE_UPDATED,
|
| content::NotificationService::AllSources());
|
| ExecuteScript(L"document.body.children[0].focus()");
|
| @@ -652,7 +652,7 @@
|
| document_checker.CheckAccessible(GetRendererAccessible());
|
|
|
| // Focus the document accessible. This will un-focus the current node.
|
| - ui_test_utils::WindowedNotificationObserver tree_updated_observer3(
|
| + content::WindowedNotificationObserver tree_updated_observer3(
|
| content::NOTIFICATION_RENDER_VIEW_HOST_ACCESSIBILITY_TREE_UPDATED,
|
| content::NotificationService::AllSources());
|
| base::win::ScopedComPtr<IAccessible> document_accessible(
|
| @@ -671,7 +671,7 @@
|
|
|
| IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
|
| TestNotificationValueChanged) {
|
| - ui_test_utils::WindowedNotificationObserver tree_updated_observer1(
|
| + content::WindowedNotificationObserver tree_updated_observer1(
|
| content::NOTIFICATION_RENDER_VIEW_HOST_ACCESSIBILITY_TREE_UPDATED,
|
| content::NotificationService::AllSources());
|
| GURL tree_url("data:text/html,<body><input type='text' value='old value'/>"
|
| @@ -693,7 +693,7 @@
|
| document_checker.CheckAccessible(GetRendererAccessible());
|
|
|
| // Set the value of the text control
|
| - ui_test_utils::WindowedNotificationObserver tree_updated_observer2(
|
| + content::WindowedNotificationObserver tree_updated_observer2(
|
| content::NOTIFICATION_RENDER_VIEW_HOST_ACCESSIBILITY_TREE_UPDATED,
|
| content::NotificationService::AllSources());
|
| ExecuteScript(L"document.body.children[0].value='new value'");
|
| @@ -714,7 +714,7 @@
|
| // provided by RenderWidgetHostViewWin in GetNativeViewAccessible().
|
| IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
|
| ContainsRendererAccessibilityTree) {
|
| - ui_test_utils::WindowedNotificationObserver tree_updated_observer1(
|
| + content::WindowedNotificationObserver tree_updated_observer1(
|
| content::NOTIFICATION_RENDER_VIEW_HOST_ACCESSIBILITY_TREE_UPDATED,
|
| content::NotificationService::AllSources());
|
| GURL tree_url("data:text/html,<html><head><title>MyDocument</title></head>"
|
| @@ -743,7 +743,7 @@
|
|
|
| IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
|
| TestToggleButtonRoleAndStates) {
|
| - ui_test_utils::WindowedNotificationObserver tree_updated_observer1(
|
| + content::WindowedNotificationObserver tree_updated_observer1(
|
| content::NOTIFICATION_RENDER_VIEW_HOST_ACCESSIBILITY_TREE_UPDATED,
|
| content::NotificationService::AllSources());
|
| AccessibleChecker* button_checker;
|
| @@ -823,7 +823,7 @@
|
|
|
| IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
|
| SupportsISimpleDOM) {
|
| - ui_test_utils::WindowedNotificationObserver tree_updated_observer1(
|
| + content::WindowedNotificationObserver tree_updated_observer1(
|
| content::NOTIFICATION_RENDER_VIEW_HOST_ACCESSIBILITY_TREE_UPDATED,
|
| content::NotificationService::AllSources());
|
| GURL tree_url("data:text/html,<body><input type='checkbox' /></body>");
|
| @@ -890,7 +890,7 @@
|
| }
|
|
|
| IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest, TestRoleGroup) {
|
| - ui_test_utils::WindowedNotificationObserver tree_updated_observer1(
|
| + content::WindowedNotificationObserver tree_updated_observer1(
|
| content::NOTIFICATION_RENDER_VIEW_HOST_ACCESSIBILITY_TREE_UPDATED,
|
| content::NotificationService::AllSources());
|
| GURL tree_url("data:text/html,<fieldset></fieldset><div role=group></div>");
|
|
|