summaryrefslogtreecommitdiffstats
path: root/chrome/browser/fast_shutdown_browsertest.cc
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-20 00:17:26 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-20 00:17:26 +0000
commit59253a654e20e6f6613acfe70bbcded3c2733c4d (patch)
treeb085e5b9e70b3a96396a8368e60a91b2392ad1de /chrome/browser/fast_shutdown_browsertest.cc
parent4e5597783bcbadf424fc01ce3306d6db61f1b540 (diff)
downloadchromium_src-59253a654e20e6f6613acfe70bbcded3c2733c4d.zip
chromium_src-59253a654e20e6f6613acfe70bbcded3c2733c4d.tar.gz
chromium_src-59253a654e20e6f6613acfe70bbcded3c2733c4d.tar.bz2
Remove tabstrip wrappers in browser_tabstrip.
BUG=none TEST=no functional change Review URL: https://chromiumcodereview.appspot.com/11411035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168648 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/fast_shutdown_browsertest.cc')
-rw-r--r--chrome/browser/fast_shutdown_browsertest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/fast_shutdown_browsertest.cc b/chrome/browser/fast_shutdown_browsertest.cc
index 1b4a526..e306f20 100644
--- a/chrome/browser/fast_shutdown_browsertest.cc
+++ b/chrome/browser/fast_shutdown_browsertest.cc
@@ -9,8 +9,8 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/ui/browser_tabstrip.h"
#include "chrome/browser/ui/tab_contents/tab_contents.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/test/base/in_process_browser_test.h"
@@ -44,7 +44,7 @@ IN_PROC_BROWSER_TEST_F(FastShutdown, DISABLED_SlowTermination) {
ASSERT_TRUE(test_server()->Start());
// This page has an unload handler.
GURL url = test_server()->GetURL("files/fast_shutdown/on_unloader.html");
- TabContents* tab = chrome::GetActiveTabContents(browser());
+ TabContents* tab = browser()->tab_strip_model()->GetActiveTabContents();
EXPECT_EQ("", content::GetCookies(tab->profile(), url));
content::WindowedNotificationObserver window_observer(