Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(46)

Unified Diff: chrome/browser/task_manager/task_manager_browsertest.cc

Issue 10533070: TabContentsWrapper -> TabContents, part 31. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/task_manager/task_manager_browsertest.cc
diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc
index c265575e0915683f4b37de9ef9778d4adab150d7..9ec8186634ccdade40bcd863eac054b3a7e408b9 100644
--- a/chrome/browser/task_manager/task_manager_browsertest.cc
+++ b/chrome/browser/task_manager/task_manager_browsertest.cc
@@ -22,7 +22,7 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_navigator.h"
#include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/extensions/extension.h"
@@ -103,8 +103,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeTabContentsChanges) {
ASSERT_TRUE(StartsWith(model()->GetResourceTitle(2), prefix, true));
// Close the tab and verify that we notice.
- WebContents* first_tab =
- browser()->GetTabContentsWrapperAt(0)->web_contents();
+ WebContents* first_tab = browser()->GetTabContentsAt(0)->web_contents();
ASSERT_TRUE(first_tab);
browser()->CloseTabContents(first_tab);
TaskManagerBrowserTestUtil::WaitForResourceChange(2);
@@ -395,7 +394,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest,
// 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();
+ browser()->GetActiveTabContents()->infobar_tab_helper();
ASSERT_EQ(1U, infobar_helper->infobar_count());
ConfirmInfoBarDelegate* delegate = infobar_helper->
GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate();
« no previous file with comments | « chrome/browser/task_manager/task_manager.cc ('k') | chrome/browser/task_manager/task_manager_resource_providers.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698