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

Unified Diff: chrome/browser/managed_mode/managed_mode_browsertest.cc

Issue 13846007: Allow showing pending URL for new tab navigations, but only if safe. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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
Index: chrome/browser/managed_mode/managed_mode_browsertest.cc
diff --git a/chrome/browser/managed_mode/managed_mode_browsertest.cc b/chrome/browser/managed_mode/managed_mode_browsertest.cc
index ec718e7f34596054e6e0a14c2e6008a08fa191e0..d3a53d6406e3f4994584b5814e22cb4471569ab5 100644
--- a/chrome/browser/managed_mode/managed_mode_browsertest.cc
+++ b/chrome/browser/managed_mode/managed_mode_browsertest.cc
@@ -175,6 +175,9 @@ class ManagedModeBlockModeTest : public InProcessBrowserTest {
content::NotificationService::AllSources());
InfoBarService* infobar_service =
InfoBarService::FromWebContents(tab);
+ content::WindowedNotificationObserver back_observer(
+ content::NOTIFICATION_LOAD_STOP,
+ content::Source<NavigationController>(&tab->GetController()));
switch (infobar_action) {
case INFOBAR_ACCEPT:
@@ -185,6 +188,7 @@ class ManagedModeBlockModeTest : public InProcessBrowserTest {
case INFOBAR_CANCEL:
confirm_info_bar_delegate->InfoBarDismissed();
ASSERT_FALSE(confirm_info_bar_delegate->Cancel());
+ back_observer.Wait();
infobar_service->RemoveInfoBar(confirm_info_bar_delegate);
break;
case INFOBAR_ALREADY_ADDED:
« no previous file with comments | « chrome/browser/external_extension_browsertest.cc ('k') | chrome/browser/ui/browser_navigator_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698