summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorctguil@chromium.org <ctguil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-15 07:28:26 +0000
committerctguil@chromium.org <ctguil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-15 07:28:26 +0000
commit3a66b78999e8932914e5157facc4fccac391c09d (patch)
tree7762d8252cb8f01d37b843fc43500a196d9b4b17 /chrome
parent8d58a2da0140361d0b191c4d6327cc23a42c3760 (diff)
downloadchromium_src-3a66b78999e8932914e5157facc4fccac391c09d.zip
chromium_src-3a66b78999e8932914e5157facc4fccac391c09d.tar.gz
chromium_src-3a66b78999e8932914e5157facc4fccac391c09d.tar.bz2
Wait for the initial accessibility tree to load from the renderer.
BUG=48655 TEST=interactive_ui_tests.exe --gtest_filter=AccessibilityWinBrowserTest.* Review URL: http://codereview.chromium.org/2955008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52458 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/accessibility_win_browsertest.cc15
1 files changed, 6 insertions, 9 deletions
diff --git a/chrome/browser/accessibility_win_browsertest.cc b/chrome/browser/accessibility_win_browsertest.cc
index 74283ed..d946082 100644
--- a/chrome/browser/accessibility_win_browsertest.cc
+++ b/chrome/browser/accessibility_win_browsertest.cc
@@ -16,13 +16,6 @@
#include "chrome/test/in_process_browser_test.h"
#include "chrome/test/ui_test_utils.h"
-#if defined(OS_WIN)
-// http://crbug.com/48655
-#define SKIP_WIN(test) DISABLED_##test
-#else
-#define SKIP_WIN(test) test
-#endif
-
namespace {
class AccessibilityWinBrowserTest : public InProcessBrowserTest {
@@ -213,7 +206,7 @@ void AccessibleChecker::CheckAccessibleChildren(IAccessible* parent) {
}
IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
- SKIP_WIN(TestRendererAccessibilityTree)) {
+ TestRendererAccessibilityTree) {
// By requesting an accessible chrome will believe a screen reader has been
// detected.
ScopedComPtr<IAccessible> document_accessible(
@@ -228,6 +221,10 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
EXPECT_EQ(V_VT(&var_state), VT_I4);
EXPECT_EQ(V_I4(&var_state), STATE_SYSTEM_BUSY);
+ // Wait for the initial accessibility tree to load.
+ ui_test_utils::WaitForNotification(
+ NotificationType::RENDER_VIEW_HOST_ACCESSIBILITY_TREE_UPDATED);
+
GURL tree_url(
"data:text/html,<html><head><title>Accessibility Win Test</title></head>"
"<body><input type='button' value='push' /><input type='checkbox' />"
@@ -263,7 +260,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
ui_test_utils::NavigateToURL(browser(), about_url);
// Verify that the IAccessible reference still points to a valid object and
- // that it calls to its methods fail since the tree is no longer valid after
+ // that calls to its methods fail since the tree is no longer valid after
// the page navagation.
// Todo(ctguil): Currently this is giving a false positive because E_FAIL is
// returned when BrowserAccessibilityManager::RequestAccessibilityInfo fails