Revert 96593 - Fix up various browser tests not to use WaitForNavigation.

chrome/browser/crash_recovery_browsertest.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 "base/file_path.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/common/content_notification_types.h"
 #include "content/common/page_transition_types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 void SimulateRendererCrash(Browser* browser) {
-  ui_test_utils::WindowedNotificationObserver observer(
-      content::NOTIFICATION_TAB_CONTENTS_DISCONNECTED,
-      NotificationService::AllSources());
   browser->OpenURL(GURL(chrome::kChromeUICrashURL), GURL(), CURRENT_TAB,
                    PageTransition::TYPED);
-  observer.Wait();
+  LOG(ERROR) << "SimulateRendererCrash, before WaitForNotification";
+  ui_test_utils::WaitForNotification(
+      content::NOTIFICATION_TAB_CONTENTS_DISCONNECTED);
+  LOG(ERROR) << "SimulateRendererCrash, after WaitForNotification";
 }
 
 }  // namespace
 
 class CrashRecoveryBrowserTest : public InProcessBrowserTest {
 };
 
 // Test that reload works after a crash.
 // Disabled, http://crbug.com/29331, http://crbug.com/69637.
 IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, Reload) {
   // The title of the active tab should change each time this URL is loaded.
   GURL url(
       "data:text/html,<script>document.title=new Date().valueOf()</script>");
   ui_test_utils::NavigateToURL(browser(), url);
 
   string16 title_before_crash;
   string16 title_after_crash;
 
   ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(),
                                                 &title_before_crash));
   SimulateRendererCrash(browser());
-  ui_test_utils::WindowedNotificationObserver observer(
-      content::NOTIFICATION_LOAD_STOP,
-      Source<NavigationController>(
-          &browser()->GetSelectedTabContentsWrapper()->controller()));
   browser()->Reload(CURRENT_TAB);
-  observer.Wait();
+  LOG(ERROR) << "Before WaitForNavigationInCurrentTab";
+  ASSERT_TRUE(ui_test_utils::WaitForNavigationInCurrentTab(browser()));
+  LOG(ERROR) << "After WaitForNavigationInCurrentTab";
   ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(),
                                                 &title_after_crash));
   EXPECT_NE(title_before_crash, title_after_crash);
 }
 
 // Tests that loading a crashed page in a new tab correctly updates the title.
 // There was an earlier bug (1270510) in process-per-site in which the max page
 // ID of the RenderProcessHost was stale, so the NavigationEntry in the new tab
 // was not committed.  This prevents regression of that bug.
 // http://crbug.com/57158 - Times out sometimes on all platforms.
 IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, LoadInNewTab) {
   const FilePath::CharType* kTitle2File = FILE_PATH_LITERAL("title2.html");
 
   ui_test_utils::NavigateToURL(browser(),
       ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory),
                                 FilePath(kTitle2File)));
 
   string16 title_before_crash;
   string16 title_after_crash;
 
   ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(),
                                                 &title_before_crash));
   SimulateRendererCrash(browser());
-  ui_test_utils::WindowedNotificationObserver observer(
-      content::NOTIFICATION_LOAD_STOP,
-      Source<NavigationController>(
-          &browser()->GetSelectedTabContentsWrapper()->controller()));
   browser()->Reload(CURRENT_TAB);
-  observer.Wait();
+  LOG(ERROR) << "Before WaitForNavigationInCurrentTab";
+  ASSERT_TRUE(ui_test_utils::WaitForNavigationInCurrentTab(browser()));
+  LOG(ERROR) << "After WaitForNavigationInCurrentTab";
   ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(),
                                                 &title_after_crash));
   EXPECT_EQ(title_before_crash, title_after_crash);
 }