diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-14 18:38:10 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-14 18:38:10 +0000 |
| commit | 3695357bc1e9a041a781411555ba39b7cd6319b8 (patch) | |
| tree | 652a29cb30d99b472555a589d6aec7d0e899af97 /chrome/browser/infobars | |
| parent | 85f2fcc7b577362dd1def5895d60ea70d6e6b8d0 (diff) | |
| download | chromium_src-3695357bc1e9a041a781411555ba39b7cd6319b8.zip chromium_src-3695357bc1e9a041a781411555ba39b7cd6319b8.tar.gz chromium_src-3695357bc1e9a041a781411555ba39b7cd6319b8.tar.bz2 | |
Remove GetWebContentsAt from browser_tabstrip.
BUG=167548
TEST=no functional change
Review URL: https://chromiumcodereview.appspot.com/11874002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176688 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/infobars')
| -rw-r--r-- | chrome/browser/infobars/infobars_browsertest.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/infobars/infobars_browsertest.cc b/chrome/browser/infobars/infobars_browsertest.cc index f43f8f1..f23f60a 100644 --- a/chrome/browser/infobars/infobars_browsertest.cc +++ b/chrome/browser/infobars/infobars_browsertest.cc @@ -10,7 +10,7 @@ #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/browser_tabstrip.h" +#include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/base/in_process_browser_test.h" @@ -38,8 +38,8 @@ class InfoBarsTest : public InProcessBrowserTest { chrome::NOTIFICATION_EXTENSION_LOADED, content::NotificationService::AllSources()); - ExtensionInstallPrompt* client = - new ExtensionInstallPrompt(chrome::GetActiveWebContents(browser())); + ExtensionInstallPrompt* client = new ExtensionInstallPrompt( + browser()->tab_strip_model()->GetActiveWebContents()); scoped_refptr<extensions::CrxInstaller> installer( extensions::CrxInstaller::Create(service, client)); installer->set_install_cause(extension_misc::INSTALL_CAUSE_AUTOMATION); @@ -74,8 +74,8 @@ IN_PROC_BROWSER_TEST_F(InfoBarsTest, TestInfoBarsCloseOnNewTheme) { infobar_added_2.Wait(); infobar_removed_1.Wait(); EXPECT_EQ(0u, - InfoBarService::FromWebContents( - chrome::GetWebContentsAt(browser(), 0))->GetInfoBarCount()); + InfoBarService::FromWebContents(browser()->tab_strip_model()-> + GetWebContentsAt(0))->GetInfoBarCount()); content::WindowedNotificationObserver infobar_removed_2( chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED, @@ -83,6 +83,6 @@ IN_PROC_BROWSER_TEST_F(InfoBarsTest, TestInfoBarsCloseOnNewTheme) { ThemeServiceFactory::GetForProfile(browser()->profile())->UseDefaultTheme(); infobar_removed_2.Wait(); EXPECT_EQ(0u, - InfoBarService::FromWebContents( - chrome::GetActiveWebContents(browser()))->GetInfoBarCount()); + InfoBarService::FromWebContents(browser()->tab_strip_model()-> + GetActiveWebContents())->GetInfoBarCount()); } |