diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-11 19:35:02 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-11 19:35:02 +0000 |
| commit | e04488797a798ff831d7d0b01e8374d714e56794 (patch) | |
| tree | 0b341832c14b9676d35015f0ab92a6c426ed678e /chrome/browser/extensions/extension_install_ui_browsertest.cc | |
| parent | 1d44c10678bbdf2dedaf5255f50b2881957a2604 (diff) | |
| download | chromium_src-e04488797a798ff831d7d0b01e8374d714e56794.zip chromium_src-e04488797a798ff831d7d0b01e8374d714e56794.tar.gz chromium_src-e04488797a798ff831d7d0b01e8374d714e56794.tar.bz2 | |
Remove TabStripModel wrapper use.
BUG=167548
TEST=no functional change
Review URL: https://chromiumcodereview.appspot.com/11833044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176415 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_install_ui_browsertest.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_install_ui_browsertest.cc | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/chrome/browser/extensions/extension_install_ui_browsertest.cc b/chrome/browser/extensions/extension_install_ui_browsertest.cc index bb916bf..af79818 100644 --- a/chrome/browser/extensions/extension_install_ui_browsertest.cc +++ b/chrome/browser/extensions/extension_install_ui_browsertest.cc @@ -14,7 +14,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_finder.h" -#include "chrome/browser/ui/browser_tabstrip.h" +#include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" #include "content/public/browser/web_contents.h" @@ -26,7 +26,8 @@ class ExtensionInstallUIBrowserTest : public ExtensionBrowserTest { // Checks that a theme info bar is currently visible and issues an undo to // revert to the previous theme. void VerifyThemeInfoBarAndUndoInstall() { - WebContents* web_contents = chrome::GetActiveWebContents(browser()); + WebContents* web_contents = + browser()->tab_strip_model()->GetActiveWebContents(); ASSERT_TRUE(web_contents); InfoBarService* infobar_service = InfoBarService::FromWebContents(web_contents); @@ -122,14 +123,15 @@ IN_PROC_BROWSER_TEST_F(ExtensionInstallUIBrowserTest, IN_PROC_BROWSER_TEST_F(ExtensionInstallUIBrowserTest, AppInstallConfirmation) { - int num_tabs = browser()->tab_count(); + int num_tabs = browser()->tab_strip_model()->count(); FilePath app_dir = test_data_dir_.AppendASCII("app"); ASSERT_TRUE(InstallExtensionWithUIAutoConfirm(app_dir, 1, browser())); if (NewTabUI::ShouldShowApps()) { - EXPECT_EQ(num_tabs + 1, browser()->tab_count()); - WebContents* web_contents = chrome::GetActiveWebContents(browser()); + EXPECT_EQ(num_tabs + 1, browser()->tab_strip_model()->count()); + WebContents* web_contents = + browser()->tab_strip_model()->GetActiveWebContents(); ASSERT_TRUE(web_contents); EXPECT_TRUE(StartsWithASCII(web_contents->GetURL().spec(), "chrome://newtab/", false)); @@ -142,17 +144,19 @@ IN_PROC_BROWSER_TEST_F(ExtensionInstallUIBrowserTest, AppInstallConfirmation_Incognito) { Browser* incognito_browser = CreateIncognitoBrowser(); - int num_incognito_tabs = incognito_browser->tab_count(); - int num_normal_tabs = browser()->tab_count(); + int num_incognito_tabs = incognito_browser->tab_strip_model()->count(); + int num_normal_tabs = browser()->tab_strip_model()->count(); FilePath app_dir = test_data_dir_.AppendASCII("app"); ASSERT_TRUE(InstallExtensionWithUIAutoConfirm(app_dir, 1, incognito_browser)); - EXPECT_EQ(num_incognito_tabs, incognito_browser->tab_count()); + EXPECT_EQ(num_incognito_tabs, + incognito_browser->tab_strip_model()->count()); if (NewTabUI::ShouldShowApps()) { - EXPECT_EQ(num_normal_tabs + 1, browser()->tab_count()); - WebContents* web_contents = chrome::GetActiveWebContents(browser()); + EXPECT_EQ(num_normal_tabs + 1, browser()->tab_strip_model()->count()); + WebContents* web_contents = + browser()->tab_strip_model()->GetActiveWebContents(); ASSERT_TRUE(web_contents); EXPECT_TRUE(StartsWithASCII(web_contents->GetURL().spec(), "chrome://newtab/", false)); |