Fix up various browser tests not to use WaitForNavigation.

chrome/test/in_process_browser_test.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/in_process_browser_test.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
@@ skipping 39 matching lines @@
 #include "chrome/browser/ui/views/frame/browser_frame_win.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/audio_handler.h"
 #endif
 
 namespace {
 
 void InitializeBrowser(Browser* browser) {
+  ui_test_utils::WindowedNotificationObserver observer(
+      content::NOTIFICATION_LOAD_STOP,
+      NotificationService::AllSources());
   browser->AddSelectedTabWithURL(GURL(chrome::kAboutBlankURL),
                                  PageTransition::START_PAGE);
-
   // Wait for the page to finish loading.
-  ui_test_utils::WaitForNavigation(
-      &browser->GetSelectedTabContents()->controller());
-
+  observer.Wait();
   browser->window()->Show();
 }
-
 }  // namespace
 
 extern int BrowserMain(const MainFunctionParams&);
 
 const char kUnitTestShowWindows[] = "show-windows";
 
 // Passed as value of kTestType.
 static const char kBrowserTestType[] = "browser";
 
 InProcessBrowserTest::InProcessBrowserTest()
@@ skipping 273 matching lines @@
     return;
 
   // Invoke CloseAllBrowsersAndMayExit on a running message loop.
   // CloseAllBrowsersAndMayExit exits the message loop after everything has been
   // shut down properly.
   MessageLoopForUI::current()->PostTask(
       FROM_HERE,
       NewRunnableFunction(&BrowserList::AttemptExit));
   ui_test_utils::RunMessageLoop();
 }