diff options
| author | ctguil@chromium.org <ctguil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-26 00:00:27 +0000 |
|---|---|---|
| committer | ctguil@chromium.org <ctguil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-26 00:00:27 +0000 |
| commit | ed75b15c2de8580e0011b021ff88f2ea2aaefabc (patch) | |
| tree | faeaa56ee79989c15dee407dec866524e8c0c45d /chrome | |
| parent | e7b50f8584dd7c66ed5bf37213b1c8ca58ce169d (diff) | |
| download | chromium_src-ed75b15c2de8580e0011b021ff88f2ea2aaefabc.zip chromium_src-ed75b15c2de8580e0011b021ff88f2ea2aaefabc.tar.gz chromium_src-ed75b15c2de8580e0011b021ff88f2ea2aaefabc.tar.bz2 | |
Fix flakyness of browser_tests:BrowserViewsAccessibilityTest.TestChromeWindowAccObj
Finish nagivation to "about:blank" before checking the name returned by the window's IAccessible.
BUG=44486
TEST=browser_tests:BrowserViewsAccessibilityTest.TestChromeWindowAccObj
Review URL: http://codereview.chromium.org/2092011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48226 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/views/browser_views_accessibility_browsertest.cc | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/chrome/browser/views/browser_views_accessibility_browsertest.cc b/chrome/browser/views/browser_views_accessibility_browsertest.cc index 7c18984..2392467 100644 --- a/chrome/browser/views/browser_views_accessibility_browsertest.cc +++ b/chrome/browser/views/browser_views_accessibility_browsertest.cc @@ -5,13 +5,16 @@ #include <oleacc.h> #include "app/l10n_util.h" +#include "base/scoped_comptr_win.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/view_ids.h" #include "chrome/browser/views/bookmark_bar_view.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/toolbar_view.h" +#include "chrome/common/url_constants.h" #include "chrome/test/in_process_browser_test.h" +#include "chrome/test/ui_test_utils.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "views/accessibility/view_accessibility_wrapper.h" @@ -134,18 +137,17 @@ IN_PROC_BROWSER_TEST_F(BrowserViewsAccessibilityTest, ASSERT_TRUE(NULL != hwnd); // Get accessibility object. - IAccessible* acc_obj = NULL; + ScopedComPtr<IAccessible> acc_obj; HRESULT hr = ::AccessibleObjectFromWindow(hwnd, OBJID_WINDOW, IID_IAccessible, reinterpret_cast<void**>(&acc_obj)); ASSERT_EQ(S_OK, hr); ASSERT_TRUE(NULL != acc_obj); - // TODO(ctguil): Fix. The window title could be "New Tab - Chromium" or - // "about:blank - Chromium" - TestAccessibilityInfo(acc_obj, l10n_util::GetString(IDS_PRODUCT_NAME), - ROLE_SYSTEM_WINDOW); - - acc_obj->Release(); + ui_test_utils::NavigateToURL(browser(), GURL(chrome::kAboutBlankURL)); + std::wstring title = + l10n_util::GetStringF(IDS_BROWSER_WINDOW_TITLE_FORMAT, + ASCIIToWide(chrome::kAboutBlankURL)); + TestAccessibilityInfo(acc_obj, title, ROLE_SYSTEM_WINDOW); } // Retrieve accessibility object for non client view and verify accessibility |