diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-01 04:30:42 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-01 04:30:42 +0000 |
| commit | b2a92946ed1b5b36910c57eda38f3699da4484ca (patch) | |
| tree | d16e8ac224663f23aca2af65597bc237e02e71f2 /chrome/test | |
| parent | bfbcc6c91900a3055cc34cdb606543b4685102dd (diff) | |
| download | chromium_src-b2a92946ed1b5b36910c57eda38f3699da4484ca.zip chromium_src-b2a92946ed1b5b36910c57eda38f3699da4484ca.tar.gz chromium_src-b2a92946ed1b5b36910c57eda38f3699da4484ca.tar.bz2 | |
Revert 99099 (TaskManagerBrowserTest.NoticeHostedAppTabs started failing,
speculatively reverting this one since it looks related.)
- Fix up more WaitForNavigation calls. Almost all fixed now.
R=phajdan.jr@chromium.org
BUG=None.
TEST=brower_tests,ui_tests
Review URL: http://codereview.chromium.org/7745037
TBR=gbillock@chromium.org
Review URL: http://codereview.chromium.org/7825003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99124 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/base/in_process_browser_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc index 7986608..d8d621f 100644 --- a/chrome/test/base/in_process_browser_test.cc +++ b/chrome/test/base/in_process_browser_test.cc @@ -274,12 +274,12 @@ Browser* InProcessBrowserTest::CreateBrowserForPopup(Profile* profile) { } void InProcessBrowserTest::AddBlankTabAndShow(Browser* browser) { - ui_test_utils::WindowedNotificationObserver observer( - content::NOTIFICATION_LOAD_STOP, - NotificationService::AllSources()); browser->AddSelectedTabWithURL( GURL(chrome::kAboutBlankURL), PageTransition::START_PAGE); - observer.Wait(); + + // Wait for the page to finish loading. + ui_test_utils::WaitForNavigation( + &browser->GetSelectedTabContents()->controller()); browser->window()->Show(); } |