Fix up various browser tests not to use WaitForNavigation.

chrome/test/base/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/base/ui_test_utils.h"
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 39 matching lines @@
 
 #if defined(TOOLKIT_VIEWS)
 #include "views/focus/accelerator_handler.h"
 #endif
 
 namespace ui_test_utils {
 
 namespace {
 
 // Used to block until a navigation completes.
+// TODO(gbillock): this should be merged with TestNavigationObserver
 class NavigationNotificationObserver : public NotificationObserver {
  public:
   NavigationNotificationObserver(const NotificationSource& source,
                                  int number_of_navigations)
       : navigation_started_(false),
         navigations_completed_(0),
         number_of_navigations_(number_of_navigations),
         running_(false),
         done_(false) {
     registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED, source);
@@ skipping 981 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