diff options
| author | droger@chromium.org <droger@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-10 13:53:26 +0000 |
|---|---|---|
| committer | droger@chromium.org <droger@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-10 13:53:26 +0000 |
| commit | b44f1d387d68ab967d19c39c621d11526928f576 (patch) | |
| tree | 059b0d4a2f7d1c94ce99e9d24dd9cf45b8ef35d6 /chrome/browser/infobars/infobars_browsertest.cc | |
| parent | 78ecee494f7c61af7923b3f61126b088b5592e2b (diff) | |
| download | chromium_src-b44f1d387d68ab967d19c39c621d11526928f576.zip chromium_src-b44f1d387d68ab967d19c39c621d11526928f576.tar.gz chromium_src-b44f1d387d68ab967d19c39c621d11526928f576.tar.bz2 | |
InfoBarService inherits from InfoBarManager
This allows to change the implementation of InfoBarDelegate::web_contents()
such that it no longer calls InfoBarManager::web_contents() (which will be
removed), but InfoBarService::web_contents() instead.
BUG=354379
TBR=jochen
Review URL: https://codereview.chromium.org/228293004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262976 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/infobars/infobars_browsertest.cc')
| -rw-r--r-- | chrome/browser/infobars/infobars_browsertest.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/chrome/browser/infobars/infobars_browsertest.cc b/chrome/browser/infobars/infobars_browsertest.cc index 415c9ed..17d71e4 100644 --- a/chrome/browser/infobars/infobars_browsertest.cc +++ b/chrome/browser/infobars/infobars_browsertest.cc @@ -7,7 +7,6 @@ #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/extension_install_prompt.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/infobars/infobar_manager.h" #include "chrome/browser/infobars/infobar_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/themes/theme_service.h" @@ -82,9 +81,10 @@ IN_PROC_BROWSER_TEST_F(InfoBarsTest, TestInfoBarsCloseOnNewTheme) { InstallExtension("theme2.crx"); infobar_added_2.Wait(); infobar_removed_1.Wait(); - EXPECT_EQ(0u, - InfoBarService::FromWebContents(browser()->tab_strip_model()-> - GetWebContentsAt(0))->infobar_manager()->infobar_count()); + EXPECT_EQ( + 0u, + InfoBarService::FromWebContents( + browser()->tab_strip_model()->GetWebContentsAt(0))->infobar_count()); content::WindowedNotificationObserver infobar_removed_2( chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED, @@ -92,6 +92,7 @@ IN_PROC_BROWSER_TEST_F(InfoBarsTest, TestInfoBarsCloseOnNewTheme) { ThemeServiceFactory::GetForProfile(browser()->profile())->UseDefaultTheme(); infobar_removed_2.Wait(); EXPECT_EQ(0u, - InfoBarService::FromWebContents(browser()->tab_strip_model()-> - GetActiveWebContents())->infobar_manager()->infobar_count()); + InfoBarService::FromWebContents( + browser()->tab_strip_model()->GetActiveWebContents())-> + infobar_count()); } |