Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4067)

Unified Diff: chrome/browser/sidebar/sidebar_browsertest.cc

Issue 7633032: Revert 96593 - Fix up various browser tests not to use WaitForNavigation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/pdf_browsertest.cc ('k') | chrome/browser/ssl/ssl_browser_tests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sidebar/sidebar_browsertest.cc
===================================================================
--- chrome/browser/sidebar/sidebar_browsertest.cc (revision 96616)
+++ chrome/browser/sidebar/sidebar_browsertest.cc (working copy)
@@ -72,11 +72,13 @@
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 @@
}
} // namespace
+
« no previous file with comments | « chrome/browser/pdf_browsertest.cc ('k') | chrome/browser/ssl/ssl_browser_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698