Fix up various browser tests not to use WaitForNavigation.

chrome/test/ui_test_utils.cc

 // 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.
 
 #include "chrome/test/ui_test_utils.h"
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 842 matching lines @@
 
 WindowedNotificationObserver::WindowedNotificationObserver(
     int notification_type,
     const NotificationSource& source)
     : seen_(false),
       running_(false),
       waiting_for_(source) {
   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() {
   if (seen_ || (waiting_for_ == NotificationService::AllSources() &&
                 !sources_seen_.empty())) {
     return;
   }
 
   running_ = true;
   ui_test_utils::RunMessageLoop();
@@ skipping 170 matching lines @@
   return taker.TakeRenderWidgetSnapshot(rwh, page_size, page_size, bitmap);
 }
 
 bool TakeEntirePageSnapshot(RenderViewHost* rvh, SkBitmap* bitmap) {
   DCHECK(bitmap);
   SnapshotTaker taker;
   return taker.TakeEntirePageSnapshot(rvh, bitmap);
 }
 
 }  // namespace ui_test_utils