diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-12 07:53:49 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-12 07:53:49 +0000 |
| commit | 911bea46277c806a2c76cb093cd79938d74392b9 (patch) | |
| tree | ed93fcfb151d6817b6cb8f7ffda6cdbe1086c328 /chrome/browser/task_manager/task_manager_browsertest.cc | |
| parent | d83f1c1a0be3c53cf451293c7160f0eef8fc8913 (diff) | |
| download | chromium_src-911bea46277c806a2c76cb093cd79938d74392b9.zip chromium_src-911bea46277c806a2c76cb093cd79938d74392b9.tar.gz chromium_src-911bea46277c806a2c76cb093cd79938d74392b9.tar.bz2 | |
Revert "Eliminate WaitForNavigation."
This reverts commit r105015. It makes IncognitoYesScript flaky. Does TestNotificationObserver correctly handle incognito windows?
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8242003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105033 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager/task_manager_browsertest.cc')
| -rw-r--r-- | chrome/browser/task_manager/task_manager_browsertest.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc index c750215..fa9369a 100644 --- a/chrome/browser/task_manager/task_manager_browsertest.cc +++ b/chrome/browser/task_manager/task_manager_browsertest.cc @@ -296,11 +296,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_NAV_ENTRY_COMMITTED, - 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( |