diff options
| author | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 19:48:37 +0000 |
|---|---|---|
| committer | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 19:48:37 +0000 |
| commit | ae67374948bc8c9009025972683cb1ba15b3ef9d (patch) | |
| tree | a2c838f7ff06304cf3ea260d82f8811ce0d5e0f4 /chrome/browser/ui/views/find_bar_host_interactive_uitest.cc | |
| parent | e5f0856d2676944b01ecb2b01c4f18fe2bc0bd77 (diff) | |
| download | chromium_src-ae67374948bc8c9009025972683cb1ba15b3ef9d.zip chromium_src-ae67374948bc8c9009025972683cb1ba15b3ef9d.tar.gz chromium_src-ae67374948bc8c9009025972683cb1ba15b3ef9d.tar.bz2 | |
Remove a couple racy functions from ui_test_utils.
Un-disable the ReservedAccelerators test. Now seems to pass linux debug.
Get rid of usage of WaitForNavigationInCurrentTab
R=phajdan.jr@chromium.org
BUG=69475
TEST=browser_tests.*,interactive_ui_tests.*,ui_tests.*
Review URL: http://codereview.chromium.org/7693013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98093 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views/find_bar_host_interactive_uitest.cc')
| -rw-r--r-- | chrome/browser/ui/views/find_bar_host_interactive_uitest.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc b/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc index e05b49f..84feac8 100644 --- a/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc +++ b/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc @@ -162,8 +162,10 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, FocusRestoreOnTabSwitch) { EXPECT_TRUE(ASCIIToUTF16("a") == find_bar->GetFindSelectedText()); // Open another tab (tab B). + ui_test_utils::WindowedNotificationObserver observer( + content::NOTIFICATION_LOAD_STOP, NotificationService::AllSources()); browser()->AddSelectedTabWithURL(url, PageTransition::TYPED); - ASSERT_TRUE(ui_test_utils::WaitForNavigationInCurrentTab(browser())); + observer.Wait(); // Make sure Find box is open. browser()->Find(); |