diff options
| author | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-12 21:06:02 +0000 |
|---|---|---|
| committer | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-12 21:06:02 +0000 |
| commit | 8b33ed9307f04ceda8ff058500c68e96efa4fc7a (patch) | |
| tree | 4c4000d639bccd52f8b932683f50aa1aa1d7dc38 /chrome/browser/crash_recovery_browsertest.cc | |
| parent | 8c300d48ec8a5638785d8754a7bf1480c4dac5fd (diff) | |
| download | chromium_src-8b33ed9307f04ceda8ff058500c68e96efa4fc7a.zip chromium_src-8b33ed9307f04ceda8ff058500c68e96efa4fc7a.tar.gz chromium_src-8b33ed9307f04ceda8ff058500c68e96efa4fc7a.tar.bz2 | |
Revert 96593 - Fix up various browser tests not to use WaitForNavigation.
Convenience methods for WindowedNotificationObserver.
R=phajdan.jr@chromium.org
BUG=various
TEST=none
Review URL: http://codereview.chromium.org/7489019
TBR=gbillock@chromium.org
Review URL: http://codereview.chromium.org/7633032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96617 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/crash_recovery_browsertest.cc')
| -rw-r--r-- | chrome/browser/crash_recovery_browsertest.cc | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/chrome/browser/crash_recovery_browsertest.cc b/chrome/browser/crash_recovery_browsertest.cc index 8a26e5b..3c8d4f2 100644 --- a/chrome/browser/crash_recovery_browsertest.cc +++ b/chrome/browser/crash_recovery_browsertest.cc @@ -4,7 +4,6 @@ #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" @@ -16,12 +15,12 @@ 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 @@ -43,12 +42,10 @@ IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, Reload) { 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); @@ -72,12 +69,10 @@ IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, LoadInNewTab) { 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); |