Fix up various browser tests not to use WaitForNavigation.

chrome/test/ui_test_utils.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_TEST_UI_TEST_UTILS_H_
 #define CHROME_TEST_UI_TEST_UTILS_H_
 #pragma once
 
 #include <map>
 #include <queue>
@@ skipping 211 matching lines @@
                bool case_sensitive,
                int* ordinal);
 
 // Returns true if the View is focused.
 bool IsViewFocused(const Browser* browser, ViewID vid);
 
 // Simulates a mouse click on a View in the browser.
 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);
 
 // Register |observer| for the given |type| and |source| and run
 // the message loop until the observer posts a quit task.
 void RegisterAndWait(NotificationObserver* observer,
                      int type,
                      const NotificationSource& source);
 
 // Blocks until |model| finishes loading.
@@ skipping 151 matching lines @@
 //   WindowedNotificationObserver signal(...)
 //   PerformAction()
 //   signal.Wait()
 class WindowedNotificationObserver : public NotificationObserver {
  public:
   // Register to listen for notifications of the given type from either a
   // specific source, or from all sources if |source| is
   // NotificationService::AllSources().
   WindowedNotificationObserver(int notification_type,
                                const NotificationSource& source);
+
+  // Convenience constructor which will use the given NavigationController.
+  // Waits for a NOTIFICATION_LOAD_STOP event.
+  explicit WindowedNotificationObserver(const NavigationController& controller);
+
+  // Convenience constructor which will use the NavigationController from
+  // the active tab in the given browser.
+  // Waits for a NOTIFICATION_LOAD_STOP event.
+  explicit WindowedNotificationObserver(const Browser& browser);

[Paweł Hajdan Jr., 2011/07/25 18:06:13]

Please don't add those "magic constructors" here, but rather in a new class
(like WindowedLoadStopObserver/WindowedNavigationObserver).

[Greg Billock, 2011/08/02 18:11:33]

I can do that. Shall I make two new subclasses here? My inclination for putting
them here is that they're basically just alternate forms for the
NotificationSource, which can be kind of verbose and template-y.

I'm suspicious they'll be more discoverable in this one notification observer
class than separated out.

[Paweł Hajdan Jr., 2011/08/02 20:11:19]

Well, do we actually need those ctors? Why not do what they do in the calling
code?

+
   virtual ~WindowedNotificationObserver();
 
   // Wait until the specified notification occurs.  If the notification was
   // emitted between the construction of this object and this call then it
   // returns immediately.
   void Wait();
 
   // WaitFor waits until the given notification type is received from the
   // given object. If the notification was emitted between the construction of
   // this object and this call then it returns immediately.
@@ skipping 174 matching lines @@
 
 // Takes a snapshot of the entire page, according to the width and height
 // properties of the DOM's document. Returns true on success. DOMAutomation
 // must be enabled.
 bool TakeEntirePageSnapshot(RenderViewHost* rvh,
                             SkBitmap* bitmap) WARN_UNUSED_RESULT;
 
 }  // namespace ui_test_utils
 
 #endif  // CHROME_TEST_UI_TEST_UTILS_H_