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/browser/task_manager | |
| 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/browser/task_manager')
| -rw-r--r-- | chrome/browser/task_manager/task_manager_browsertest.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc index aaf0aef..2fe1ad4 100644 --- a/chrome/browser/task_manager/task_manager_browsertest.cc +++ b/chrome/browser/task_manager/task_manager_browsertest.cc @@ -295,10 +295,9 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeHostedAppTabs) { // Open a new tab to an app URL before the app is loaded. GURL url(base_url.Resolve("path1/empty.html")); - ui_test_utils::WindowedNotificationObserver observer( - content::NOTIFICATION_LOAD_STOP, NotificationService::AllSources()); AddTabAtIndex(0, url, PageTransition::TYPED); - observer.Wait(); + ui_test_utils::WaitForNavigation( + &browser()->GetSelectedTabContents()->controller()); // Check that the third entry's title starts with "Tab:". string16 tab_prefix = l10n_util::GetStringFUTF16( |