diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-01 16:48:17 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-01 16:48:17 +0000 |
| commit | aa1834c788f85aef89c3e39cf8258e8d2ad42281 (patch) | |
| tree | b26d28cfc982f0069fee45d4d8df4e60e519872e /chrome/browser/task_manager/task_manager_browsertest.cc | |
| parent | 25af8b0f78aa52c2484e71ae3c8ce36cf1a72051 (diff) | |
| download | chromium_src-aa1834c788f85aef89c3e39cf8258e8d2ad42281.zip chromium_src-aa1834c788f85aef89c3e39cf8258e8d2ad42281.tar.gz chromium_src-aa1834c788f85aef89c3e39cf8258e8d2ad42281.tar.bz2 | |
Revert 99187 (speculative revert for ProfileSyncServiceSessionTest.FailModelAssociation on 10.5)
- Move infobar handling to a tab helper, part 1.
BUG=94741
TEST=no visible change
Review URL: http://codereview.chromium.org/7810002
TBR=avi@chromium.org
Review URL: http://codereview.chromium.org/7827017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99198 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 | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc index fa9369a..2fe1ad4 100644 --- a/chrome/browser/task_manager/task_manager_browsertest.cc +++ b/chrome/browser/task_manager/task_manager_browsertest.cc @@ -11,7 +11,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/infobars/infobar_tab_helper.h" #include "chrome/browser/notifications/desktop_notification_service.h" #include "chrome/browser/notifications/notification.h" #include "chrome/browser/notifications/notification_test_util.h" @@ -374,11 +373,10 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, // Reload the extension using the "crashed extension" infobar while the task // manager is still visible. Make sure we don't crash and the extension // gets reloaded and noticed in the task manager. - InfoBarTabHelper* infobar_helper = - browser()->GetSelectedTabContentsWrapper()->infobar_tab_helper(); - ASSERT_EQ(1U, infobar_helper->infobar_count()); - ConfirmInfoBarDelegate* delegate = infobar_helper-> - GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate(); + TabContentsWrapper* current_tab = browser()->GetSelectedTabContentsWrapper(); + ASSERT_EQ(1U, current_tab->infobar_count()); + ConfirmInfoBarDelegate* delegate = + current_tab->GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate(); ASSERT_TRUE(delegate); delegate->Accept(); TaskManagerBrowserTestUtil::WaitForResourceChange(3); |