Fix up various browser tests not to use WaitForNavigation.

chrome/test/base/ui_test_utils.h

Index: chrome/test/base/ui_test_utils.h
diff --git a/chrome/test/base/ui_test_utils.h b/chrome/test/base/ui_test_utils.h
index 15f08982b104631e21f54e0983ae765b6ca1955a..455469e5f4c5a22b776c2355c65d56a8fdeb6806 100644
--- a/chrome/test/base/ui_test_utils.h
+++ b/chrome/test/base/ui_test_utils.h
@@ -229,10 +229,14 @@ bool IsViewFocused(const Browser* browser, ViewID vid);
 void ClickOnView(const Browser* browser, ViewID vid);
 
 // Blocks until a notification for given |type| is received.
+// TODO(gbillock): remove this race hazard.
+// Use WindowedNotificationObserver instead.
 void WaitForNotification(int type);
 
 // Blocks until a notification for given |type| from the specified |source|
 // is received.
+// TODO(gbillock): remove this race hazard.
+// Use WindowedNotificationObserver instead.
 void WaitForNotificationFrom(int type,
                              const NotificationSource& source);
 
@@ -404,6 +408,7 @@ class WindowedNotificationObserver : public NotificationObserver {
   // NotificationService::AllSources().
   WindowedNotificationObserver(int notification_type,
                                const NotificationSource& source);
+

[Paweł Hajdan Jr., 2011/08/04 17:56:48]

nit: I'd prefer not to add an empty line here.

[Greg Billock, 2011/08/11 22:57:45]

Done.

   virtual ~WindowedNotificationObserver();
 
   // Wait until the specified notification occurs.  If the notification was