content: convert accessibility notifications to observer usage

chrome/browser/accessibility/accessibility_win_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <atlbase.h>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
@@ skipping 202 matching lines @@
   GURL html_data_url(string("data:text/html,") + html);
   ui_test_utils::NavigateToURL(browser(), html_data_url);
 
   // At this point, renderer accessibility is off and the page has completed
   // loading. (Both of these must be strictly true or there will be test
   // flakiness.)  Now call GetRendererAccessible, which will trigger
   // changing the accessibility mode to AccessibilityModeComplete. When
   // the renderer switches accessibility on, it will send a Layout Complete
   // accessibility notification containing the full accessibility tree, which
   // we can wait for.
-  content::WindowedNotificationObserver tree_updated_observer(
-      content::NOTIFICATION_ACCESSIBILITY_LAYOUT_COMPLETE,
-      content::NotificationService::AllSources());
+  scoped_refptr<MessageLoopRunner> loop_runner(new MessageLoopRunner);
+  content::WebContents* web_contents =

[dmazzoni, 2013/02/15 19:34:19]

How about a helper method to get view_host since this code is repeated so often?
That way we could just have:

GetViewHost()->SetAccessibilityLayoutCompleteCallbackForTesting(...)

Otherwise, these changes look fine.

+      browser()->tab_strip_model()->GetActiveWebContents();
+  content::RenderViewHost* view_host = web_contents->GetRenderViewHost();
+  view_host->SetAccessibilityLayoutCompleteCallbackForTesting(
+      loop_runner->QuitClosure());
   GetRendererAccessible();
-  tree_updated_observer.Wait();
+  loop_runner->Run();
 }
 
 // Retrieve the MSAA client accessibility object for the Render Widget Host View
 // of the selected tab.
 IAccessible*
 AccessibilityWinBrowserTest::GetRendererAccessible() {
   HWND hwnd_render_widget_host_view = browser()->tab_strip_model()->
       GetActiveWebContents()->GetRenderWidgetHostView()->GetNativeView();
 
   // Invoke windows screen reader detection by sending the WM_GETOBJECT message
@@ skipping 246 matching lines @@
       IA2_ROLE_SECTION, L"");
   radio_group_checker.SetExpectedState(STATE_SYSTEM_FOCUSABLE);
   AccessibleChecker document_checker(L"", ROLE_SYSTEM_DOCUMENT, L"");
   list_item_checker.AppendExpectedChild(&list_marker_checker);
   list_item_checker.AppendExpectedChild(&static_text_checker);
   radio_group_checker.AppendExpectedChild(&list_item_checker);
   document_checker.AppendExpectedChild(&radio_group_checker);
   document_checker.CheckAccessible(GetRendererAccessible());
 
   // Set focus to the radio group.
-  content::WindowedNotificationObserver tree_updated_observer(
-      content::NOTIFICATION_ACCESSIBILITY_OTHER,
-      content::NotificationService::AllSources());
+  scoped_refptr<MessageLoopRunner> loop_runner(new MessageLoopRunner);
+  content::WebContents* web_contents =
+      browser()->tab_strip_model()->GetActiveWebContents();
+  content::RenderViewHost* view_host = web_contents->GetRenderViewHost();
+  view_host->SetAccessibilityOtherCallbackForTesting(
+      loop_runner->QuitClosure());
   ExecuteScript(L"document.body.children[0].focus()");
-  tree_updated_observer.Wait();
+  loop_runner->Run();
 
   // Check that the accessibility tree of the browser has been updated.
   radio_group_checker.SetExpectedState(
       STATE_SYSTEM_FOCUSABLE | STATE_SYSTEM_FOCUSED);
   document_checker.CheckAccessible(GetRendererAccessible());
 
   // Set the active descendant of the radio group
-  content::WindowedNotificationObserver tree_updated_observer3(
-      content::NOTIFICATION_ACCESSIBILITY_OTHER,
-      content::NotificationService::AllSources());
+  loop_runner = new MessageLoopRunner;
+  view_host->SetAccessibilityOtherCallbackForTesting(
+      loop_runner->QuitClosure());
   ExecuteScript(
       L"document.body.children[0].setAttribute('aria-activedescendant', 'li')");
-  tree_updated_observer3.Wait();
+  loop_runner->Run();
 
   // Check that the accessibility tree of the browser has been updated.
   list_item_checker.SetExpectedState(
       STATE_SYSTEM_READONLY | STATE_SYSTEM_FOCUSED);
   radio_group_checker.SetExpectedState(STATE_SYSTEM_FOCUSABLE);
   document_checker.CheckAccessible(GetRendererAccessible());
 }
 
 IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
                        TestNotificationCheckedStateChanged) {
   LoadInitialAccessibilityTreeFromHtml(
       "<body><input type='checkbox' /></body>");
 
   // Check the browser's copy of the renderer accessibility tree.
   AccessibleChecker checkbox_checker(L"", ROLE_SYSTEM_CHECKBUTTON, L"");
   checkbox_checker.SetExpectedState(STATE_SYSTEM_FOCUSABLE);
   AccessibleChecker body_checker(L"", L"body", IA2_ROLE_SECTION, L"");
   AccessibleChecker document_checker(L"", ROLE_SYSTEM_DOCUMENT, L"");
   body_checker.AppendExpectedChild(&checkbox_checker);
   document_checker.AppendExpectedChild(&body_checker);
   document_checker.CheckAccessible(GetRendererAccessible());
 
   // Check the checkbox.
-  content::WindowedNotificationObserver tree_updated_observer(
-      content::NOTIFICATION_ACCESSIBILITY_OTHER,
-      content::NotificationService::AllSources());
+  scoped_refptr<MessageLoopRunner> loop_runner(new MessageLoopRunner);
+  content::WebContents* web_contents =
+      browser()->tab_strip_model()->GetActiveWebContents();
+  content::RenderViewHost* view_host = web_contents->GetRenderViewHost();
+  view_host->SetAccessibilityOtherCallbackForTesting(
+      loop_runner->QuitClosure());
   ExecuteScript(L"document.body.children[0].checked=true");
-  tree_updated_observer.Wait();
+  loop_runner->Run();
 
   // Check that the accessibility tree of the browser has been updated.
   checkbox_checker.SetExpectedState(
       STATE_SYSTEM_CHECKED | STATE_SYSTEM_FOCUSABLE);
   document_checker.CheckAccessible(GetRendererAccessible());
 }
 
 IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
                        TestNotificationChildrenChanged) {
   // The role attribute causes the node to be in the accessibility tree.
   LoadInitialAccessibilityTreeFromHtml("<body role=group></body>");
 
   // Check the browser's copy of the renderer accessibility tree.
   AccessibleChecker group_checker(L"", ROLE_SYSTEM_GROUPING, L"");
   AccessibleChecker document_checker(L"", ROLE_SYSTEM_DOCUMENT, L"");
   document_checker.AppendExpectedChild(&group_checker);
   document_checker.CheckAccessible(GetRendererAccessible());
 
   // Change the children of the document body.
-  content::WindowedNotificationObserver tree_updated_observer(
-      content::NOTIFICATION_ACCESSIBILITY_OTHER,
-      content::NotificationService::AllSources());
+  scoped_refptr<MessageLoopRunner> loop_runner(new MessageLoopRunner);
+  content::WebContents* web_contents =
+      browser()->tab_strip_model()->GetActiveWebContents();
+  content::RenderViewHost* view_host = web_contents->GetRenderViewHost();
+  view_host->SetAccessibilityOtherCallbackForTesting(
+      loop_runner->QuitClosure());
   ExecuteScript(L"document.body.innerHTML='<b>new text</b>'");
-  tree_updated_observer.Wait();
+  loop_runner->Run();
 
   // Check that the accessibility tree of the browser has been updated.
   AccessibleChecker text_checker(L"new text", ROLE_SYSTEM_TEXT, L"");
   group_checker.AppendExpectedChild(&text_checker);
   document_checker.CheckAccessible(GetRendererAccessible());
 }
 
 IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
                        TestNotificationChildrenChanged2) {
   // The role attribute causes the node to be in the accessibility tree.
   LoadInitialAccessibilityTreeFromHtml(
       "<div role=group style='visibility: hidden'>text</div>");
 
   // Check the accessible tree of the browser.
   AccessibleChecker document_checker(L"", ROLE_SYSTEM_DOCUMENT, L"");
   document_checker.CheckAccessible(GetRendererAccessible());
 
   // Change the children of the document body.
-  content::WindowedNotificationObserver tree_updated_observer2(
-      content::NOTIFICATION_ACCESSIBILITY_OTHER,
-      content::NotificationService::AllSources());
+  scoped_refptr<MessageLoopRunner> loop_runner(new MessageLoopRunner);
+  content::WebContents* web_contents =
+      browser()->tab_strip_model()->GetActiveWebContents();
+  content::RenderViewHost* view_host = web_contents->GetRenderViewHost();
+  view_host->SetAccessibilityOtherCallbackForTesting(
+      loop_runner->QuitClosure());
   ExecuteScript(L"document.body.children[0].style.visibility='visible'");
-  tree_updated_observer2.Wait();
+  loop_runner->Run();
 
   // Check that the accessibility tree of the browser has been updated.
   AccessibleChecker static_text_checker(L"text", ROLE_SYSTEM_TEXT, L"");
   AccessibleChecker group_checker(L"", ROLE_SYSTEM_GROUPING, L"");
   document_checker.AppendExpectedChild(&group_checker);
   group_checker.AppendExpectedChild(&static_text_checker);
   document_checker.CheckAccessible(GetRendererAccessible());
 }
 
 IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
                        TestNotificationFocusChanged) {
   // The role attribute causes the node to be in the accessibility tree.
   LoadInitialAccessibilityTreeFromHtml("<div role=group tabindex='-1'></div>");
 
   // Check the browser's copy of the renderer accessibility tree.
   SCOPED_TRACE("Check initial tree");
   AccessibleChecker group_checker(L"", ROLE_SYSTEM_GROUPING, L"");
   group_checker.SetExpectedState(
       STATE_SYSTEM_FOCUSABLE | STATE_SYSTEM_OFFSCREEN);
   AccessibleChecker document_checker(L"", ROLE_SYSTEM_DOCUMENT, L"");
   document_checker.AppendExpectedChild(&group_checker);
   document_checker.CheckAccessible(GetRendererAccessible());
 
   // Focus the div in the document
-  content::WindowedNotificationObserver tree_updated_observer(
-      content::NOTIFICATION_ACCESSIBILITY_OTHER,
-      content::NotificationService::AllSources());
-  ExecuteScript(L"document.body.children[0].focus()");
-  tree_updated_observer.Wait();
+  scoped_refptr<MessageLoopRunner> loop_runner(new MessageLoopRunner);
+  content::WebContents* web_contents =
+      browser()->tab_strip_model()->GetActiveWebContents();
+  content::RenderViewHost* view_host = web_contents->GetRenderViewHost();
+  view_host->SetAccessibilityOtherCallbackForTesting(
+      loop_runner->QuitClosure());
+  loop_runner->Run();
 
   // Check that the accessibility tree of the browser has been updated.
   SCOPED_TRACE("Check updated tree after focusing div");
   group_checker.SetExpectedState(
       STATE_SYSTEM_FOCUSABLE | STATE_SYSTEM_FOCUSED);
   document_checker.CheckAccessible(GetRendererAccessible());
 
   // Focus the document accessible. This will un-focus the current node.
-  content::WindowedNotificationObserver tree_updated_observer2(
-      content::NOTIFICATION_ACCESSIBILITY_OTHER,
-      content::NotificationService::AllSources());
+  loop_runner = new MessageLoopRunner;
+  view_host->SetAccessibilityOtherCallbackForTesting(
+      loop_runner->QuitClosure());
   base::win::ScopedComPtr<IAccessible> document_accessible(
       GetRendererAccessible());
   ASSERT_NE(document_accessible.get(), reinterpret_cast<IAccessible*>(NULL));
   HRESULT hr = document_accessible->accSelect(
     SELFLAG_TAKEFOCUS, CreateI4Variant(CHILDID_SELF));
   ASSERT_EQ(S_OK, hr);
-  tree_updated_observer2.Wait();
+  loop_runner->Run();
 
   // Check that the accessibility tree of the browser has been updated.
   SCOPED_TRACE("Check updated tree after focusing document again");
   group_checker.SetExpectedState(STATE_SYSTEM_FOCUSABLE);
   document_checker.CheckAccessible(GetRendererAccessible());
 }
 
 IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
                        TestNotificationValueChanged) {
   LoadInitialAccessibilityTreeFromHtml(
       "<body><input type='text' value='old value'/></body>");
 
   // Check the browser's copy of the renderer accessibility tree.
   AccessibleChecker text_field_checker(L"", ROLE_SYSTEM_TEXT, L"old value");
   text_field_checker.SetExpectedState(STATE_SYSTEM_FOCUSABLE);
   AccessibleChecker body_checker(L"", L"body", IA2_ROLE_SECTION, L"");
   AccessibleChecker document_checker(L"", ROLE_SYSTEM_DOCUMENT, L"");
   body_checker.AppendExpectedChild(&text_field_checker);
   document_checker.AppendExpectedChild(&body_checker);
   document_checker.CheckAccessible(GetRendererAccessible());
 
   // Set the value of the text control
-  content::WindowedNotificationObserver tree_updated_observer(
-      content::NOTIFICATION_ACCESSIBILITY_OTHER,
-      content::NotificationService::AllSources());
+  scoped_refptr<MessageLoopRunner> loop_runner(new MessageLoopRunner);
+  content::WebContents* web_contents =
+      browser()->tab_strip_model()->GetActiveWebContents();
+  content::RenderViewHost* view_host = web_contents->GetRenderViewHost();
+  view_host->SetAccessibilityOtherCallbackForTesting(
+      loop_runner->QuitClosure());
   ExecuteScript(L"document.body.children[0].value='new value'");
-  tree_updated_observer.Wait();
+  loop_runner->Run();
 
   // Check that the accessibility tree of the browser has been updated.
   text_field_checker.SetExpectedValue(L"new value");
   document_checker.CheckAccessible(GetRendererAccessible());
 }
 
 // This test verifies that the web content's accessibility tree is a
 // descendant of the main browser window's accessibility tree, so that
 // tools like AccExplorer32 or AccProbe can be used to examine Chrome's
 // accessibility support.
@@ skipping 163 matching lines @@
 
   // Check the browser's copy of the renderer accessibility tree.
   AccessibleChecker grouping1_checker(L"", ROLE_SYSTEM_GROUPING, L"");
   AccessibleChecker grouping2_checker(L"", ROLE_SYSTEM_GROUPING, L"");
   AccessibleChecker document_checker(L"", ROLE_SYSTEM_DOCUMENT, L"");
   document_checker.AppendExpectedChild(&grouping1_checker);
   document_checker.AppendExpectedChild(&grouping2_checker);
   document_checker.CheckAccessible(GetRendererAccessible());
 }
 }  // namespace.