diff options
| author | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-12 19:17:50 +0000 |
|---|---|---|
| committer | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-12 19:17:50 +0000 |
| commit | 30975ed3567d5f93ba992e65b0daafd9e3922bd0 (patch) | |
| tree | acbb6bdcc0d7532b24b2f89c90fd79306a49dda6 /chrome/browser/sidebar | |
| parent | c62b7a565fc8932a2b17c1544026003f3aa1f99b (diff) | |
| download | chromium_src-30975ed3567d5f93ba992e65b0daafd9e3922bd0.zip chromium_src-30975ed3567d5f93ba992e65b0daafd9e3922bd0.tar.gz chromium_src-30975ed3567d5f93ba992e65b0daafd9e3922bd0.tar.bz2 | |
Fix up various browser tests not to use WaitForNavigation.
Convenience methods for WindowedNotificationObserver.
R=phajdan.jr@chromium.org
BUG=various
TEST=none
Review URL: http://codereview.chromium.org/7489019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96593 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sidebar')
| -rw-r--r-- | chrome/browser/sidebar/sidebar_browsertest.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/chrome/browser/sidebar/sidebar_browsertest.cc b/chrome/browser/sidebar/sidebar_browsertest.cc index 049857b..3d8d223 100644 --- a/chrome/browser/sidebar/sidebar_browsertest.cc +++ b/chrome/browser/sidebar/sidebar_browsertest.cc @@ -72,13 +72,11 @@ class SidebarTest : public ExtensionBrowserTest { SidebarManager* sidebar_manager = SidebarManager::GetInstance(); + ui_test_utils::WindowedNotificationObserver observer( + content::NOTIFICATION_LOAD_STOP, + Source<NavigationController>(&tab->controller())); sidebar_manager->NavigateSidebar(tab, content_id_, url); - - SidebarContainer* sidebar_container = - sidebar_manager->GetSidebarContainerFor(tab, content_id_); - - TabContents* client_contents = sidebar_container->sidebar_contents(); - ui_test_utils::WaitForNavigation(&client_contents->controller()); + observer.Wait(); } void ShowSidebar(TabContents* tab) { @@ -199,4 +197,3 @@ IN_PROC_BROWSER_TEST_F(SidebarTest, SidebarNavigate) { } } // namespace - |