diff options
| author | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-12 21:06:02 +0000 |
|---|---|---|
| committer | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-12 21:06:02 +0000 |
| commit | 8b33ed9307f04ceda8ff058500c68e96efa4fc7a (patch) | |
| tree | 4c4000d639bccd52f8b932683f50aa1aa1d7dc38 /chrome/browser/sidebar | |
| parent | 8c300d48ec8a5638785d8754a7bf1480c4dac5fd (diff) | |
| download | chromium_src-8b33ed9307f04ceda8ff058500c68e96efa4fc7a.zip chromium_src-8b33ed9307f04ceda8ff058500c68e96efa4fc7a.tar.gz chromium_src-8b33ed9307f04ceda8ff058500c68e96efa4fc7a.tar.bz2 | |
Revert 96593 - 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
TBR=gbillock@chromium.org
Review URL: http://codereview.chromium.org/7633032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96617 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sidebar')
| -rw-r--r-- | chrome/browser/sidebar/sidebar_browsertest.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/chrome/browser/sidebar/sidebar_browsertest.cc b/chrome/browser/sidebar/sidebar_browsertest.cc index 3d8d223..049857b 100644 --- a/chrome/browser/sidebar/sidebar_browsertest.cc +++ b/chrome/browser/sidebar/sidebar_browsertest.cc @@ -72,11 +72,13 @@ 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); - observer.Wait(); + + SidebarContainer* sidebar_container = + sidebar_manager->GetSidebarContainerFor(tab, content_id_); + + TabContents* client_contents = sidebar_container->sidebar_contents(); + ui_test_utils::WaitForNavigation(&client_contents->controller()); } void ShowSidebar(TabContents* tab) { @@ -197,3 +199,4 @@ IN_PROC_BROWSER_TEST_F(SidebarTest, SidebarNavigate) { } } // namespace + |