From ae67374948bc8c9009025972683cb1ba15b3ef9d Mon Sep 17 00:00:00 2001 From: "gbillock@chromium.org" Date: Wed, 24 Aug 2011 19:48:37 +0000 Subject: 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 --- chrome/browser/ui/views/find_bar_host_interactive_uitest.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'chrome/browser/ui/views/find_bar_host_interactive_uitest.cc') 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(); -- cgit v1.1