diff options
| author | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-10 00:08:32 +0000 |
|---|---|---|
| committer | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-10 00:08:32 +0000 |
| commit | ead48028cab08493a3a5c897bcf779602d1cbe85 (patch) | |
| tree | a5eab2ac1f2e3670bceb797bd44dfd0cf5679b51 /chrome/browser/accessibility_win_browsertest.cc | |
| parent | 662256279693de926046e988d1136469e1125daf (diff) | |
| download | chromium_src-ead48028cab08493a3a5c897bcf779602d1cbe85.zip chromium_src-ead48028cab08493a3a5c897bcf779602d1cbe85.tar.gz chromium_src-ead48028cab08493a3a5c897bcf779602d1cbe85.tar.bz2 | |
Revert 49339 - Enable renderer accessibility by default.
It seems to be breaking the ExtensionAPIClientTest.CreateWindowW unit-test.
BUG=25564
TEST=none
Review URL: http://codereview.chromium.org/2358003
TBR=ctguil@chromium.org
Review URL: http://codereview.chromium.org/2782003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49343 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/accessibility_win_browsertest.cc')
| -rw-r--r-- | chrome/browser/accessibility_win_browsertest.cc | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/chrome/browser/accessibility_win_browsertest.cc b/chrome/browser/accessibility_win_browsertest.cc index 2199a07..580a8fe 100644 --- a/chrome/browser/accessibility_win_browsertest.cc +++ b/chrome/browser/accessibility_win_browsertest.cc @@ -19,6 +19,13 @@ namespace { class AccessibilityWinBrowserTest : public InProcessBrowserTest { + public: + void SetUpCommandLine(CommandLine* command_line) { + // Turns on the accessibility in the renderer. Off by default until + // http://crbug.com/25564 is fixed. + command_line->AppendSwitch(switches::kEnableRendererAccessibility); + } + protected: IAccessible* GetRenderWidgetHostViewClientAccessible(); }; @@ -174,20 +181,6 @@ void AccessibleChecker::CheckAccessibleChildren(IAccessible* parent) { IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest, TestRendererAccessibilityTree) { - // By requesting an accessible chrome will believe a screen reader has been - // detected. - ScopedComPtr<IAccessible> document_accessible( - GetRenderWidgetHostViewClientAccessible()); - - // The initial accessible returned should have state STATE_SYSTEM_BUSY while - // the accessibility tree is being requested from the renderer. - VARIANT var_state; - HRESULT hr = document_accessible-> - get_accState(CreateI4Variant(CHILDID_SELF), &var_state); - EXPECT_EQ(hr, S_OK); - EXPECT_EQ(V_VT(&var_state), VT_I4); - EXPECT_EQ(V_I4(&var_state), STATE_SYSTEM_BUSY); - GURL tree_url( "data:text/html,<html><head><title>Accessibility Win Test</title></head>" "<body><input type='button' value='push' /><input type='checkbox' />" @@ -196,7 +189,8 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest, ui_test_utils::WaitForNotification( NotificationType::RENDER_VIEW_HOST_ACCESSIBILITY_TREE_UPDATED); - document_accessible = GetRenderWidgetHostViewClientAccessible(); + ScopedComPtr<IAccessible> document_accessible( + GetRenderWidgetHostViewClientAccessible()); ASSERT_NE(document_accessible.get(), reinterpret_cast<IAccessible*>(NULL)); AccessibleChecker button_checker(L"push", ROLE_SYSTEM_PUSHBUTTON); @@ -214,7 +208,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest, // Check that document accessible has a parent accessible. ScopedComPtr<IDispatch> parent_dispatch; - hr = document_accessible->get_accParent(parent_dispatch.Receive()); + HRESULT hr = document_accessible->get_accParent(parent_dispatch.Receive()); EXPECT_EQ(hr, S_OK); EXPECT_NE(parent_dispatch, reinterpret_cast<IDispatch*>(NULL)); |