diff options
| author | jnd@chromium.org <jnd@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-18 13:29:20 +0000 |
|---|---|---|
| committer | jnd@chromium.org <jnd@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-18 13:29:20 +0000 |
| commit | a5624d948df50aaaac50a12b4919966dd39dbfb0 (patch) | |
| tree | 38e6d1c9ec6ae80ee1ba55d250f112c9ada84fff | |
| parent | 2152727254e65392fe2984c3402a68a1c7353c01 (diff) | |
| download | chromium_src-a5624d948df50aaaac50a12b4919966dd39dbfb0.zip chromium_src-a5624d948df50aaaac50a12b4919966dd39dbfb0.tar.gz chromium_src-a5624d948df50aaaac50a12b4919966dd39dbfb0.tar.bz2 | |
Call method CheckTitle to verify title of the active tab.
After opening a new tab, the tab may not be ready to read the title. The method CheckTitle checks title within the certain timeout.
It may not a good solution but workable and existing code already uses it, so I think we use it to fix this bug.
BUG=46781
TEST=UnloadTest.BrowserCloseBeforeUnloadOK.
Review URL: http://codereview.chromium.org/6544015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75386 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/unload_uitest.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/chrome/browser/unload_uitest.cc b/chrome/browser/unload_uitest.cc index 84f0e4f..5ae47bd 100644 --- a/chrome/browser/unload_uitest.cc +++ b/chrome/browser/unload_uitest.cc @@ -414,10 +414,8 @@ TEST_F(UnloadTest, BrowserCloseTwoSecondBeforeUnloadAlert) { #define MAYBE_BrowserCloseTabWhenOtherTabHasListener \ DISABLED_BrowserCloseTabWhenOtherTabHasListener #else -// Flaky on Linux under valgrind. http://crbug.com/46781 -// TODO(stuartmorgan): Switch to just disabling for valgrind. #define MAYBE_BrowserCloseTabWhenOtherTabHasListener \ - FLAKY_BrowserCloseTabWhenOtherTabHasListener + BrowserCloseTabWhenOtherTabHasListener #endif // Tests that if there's a renderer process with two tabs, one of which has an @@ -440,11 +438,9 @@ TEST_F(UnloadTest, MAYBE_BrowserCloseTabWhenOtherTabHasListener) { ui::EF_LEFT_BUTTON_DOWN)); ASSERT_TRUE(browser->WaitForTabCountToBecome(2)); + CheckTitle(L"popup"); scoped_refptr<TabProxy> popup_tab(browser->GetActiveTab()); ASSERT_TRUE(popup_tab.get()); - std::wstring popup_title; - EXPECT_TRUE(popup_tab->GetTabTitle(&popup_title)); - EXPECT_EQ(std::wstring(L"popup"), popup_title); EXPECT_TRUE(popup_tab->Close(true)); ASSERT_TRUE(browser->WaitForTabCountToBecome(1)); |