summaryrefslogtreecommitdiffstats
path: root/chrome/browser/task_manager/task_manager_browsertest.cc
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-01 15:24:08 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-01 15:24:08 +0000
commit2f93641aca552e88c4810924fe2135b626707b45 (patch)
tree26b29b0da55fb33174def9948f0bbdb859161edd /chrome/browser/task_manager/task_manager_browsertest.cc
parent678e68ab1a5fa99f07634cce9ac22a6d700436df (diff)
downloadchromium_src-2f93641aca552e88c4810924fe2135b626707b45.zip
chromium_src-2f93641aca552e88c4810924fe2135b626707b45.tar.gz
chromium_src-2f93641aca552e88c4810924fe2135b626707b45.tar.bz2
Move infobar handling to a tab helper, part 1.
BUG=94741 TEST=no visible change Review URL: http://codereview.chromium.org/7810002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99187 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.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc
index 2fe1ad4..fa9369a 100644
--- a/chrome/browser/task_manager/task_manager_browsertest.cc
+++ b/chrome/browser/task_manager/task_manager_browsertest.cc
@@ -11,6 +11,7 @@
#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"
@@ -373,10 +374,11 @@ 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.
- TabContentsWrapper* current_tab = browser()->GetSelectedTabContentsWrapper();
- ASSERT_EQ(1U, current_tab->infobar_count());
- ConfirmInfoBarDelegate* delegate =
- current_tab->GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate();
+ InfoBarTabHelper* infobar_helper =
+ browser()->GetSelectedTabContentsWrapper()->infobar_tab_helper();
+ ASSERT_EQ(1U, infobar_helper->infobar_count());
+ ConfirmInfoBarDelegate* delegate = infobar_helper->
+ GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate();
ASSERT_TRUE(delegate);
delegate->Accept();
TaskManagerBrowserTestUtil::WaitForResourceChange(3);