Fix up various browser tests not to use WaitForNavigation.

chrome/test/ui_test_utils.cc

Index: chrome/test/ui_test_utils.cc
diff --git a/chrome/test/ui_test_utils.cc b/chrome/test/ui_test_utils.cc
index b8990346d8a7c769962fe4484592977b0610e2c9..0cdd1f1178da714e0e0e646c29663dca37fda46e 100644
--- a/chrome/test/ui_test_utils.cc
+++ b/chrome/test/ui_test_utils.cc
@@ -860,6 +860,23 @@ WindowedNotificationObserver::WindowedNotificationObserver(
   registrar_.Add(this, notification_type, waiting_for_);
 }
 
+WindowedNotificationObserver::WindowedNotificationObserver(
+    const NavigationController& controller)
+    : seen_(false),
+      running_(false),
+      waiting_for_(Source<NavigationController>(&controller)) {
+  registrar_.Add(this, content::NOTIFICATION_LOAD_STOP, waiting_for_);
+}
+
+WindowedNotificationObserver::WindowedNotificationObserver(
+    const Browser& browser)
+    : seen_(false),
+      running_(false),
+      waiting_for_(Source<NavigationController>(
+          &browser.GetSelectedTabContentsWrapper()->controller())) {
+  registrar_.Add(this, content::NOTIFICATION_LOAD_STOP, waiting_for_);
+}
+
 WindowedNotificationObserver::~WindowedNotificationObserver() {}
 
 void WindowedNotificationObserver::Wait() {