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/extensions/extension_install_ui_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/extensions/extension_install_ui_browsertest.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_install_ui_browsertest.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/chrome/browser/extensions/extension_install_ui_browsertest.cc b/chrome/browser/extensions/extension_install_ui_browsertest.cc index 7f3f9bb..ca70ad8 100644 --- a/chrome/browser/extensions/extension_install_ui_browsertest.cc +++ b/chrome/browser/extensions/extension_install_ui_browsertest.cc @@ -10,7 +10,6 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/infobars/confirm_infobar_delegate.h" #include "chrome/browser/infobars/infobar.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" @@ -41,14 +40,14 @@ class ExtensionInstallUIBrowserTest : public ExtensionBrowserTest { WebContents* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); ASSERT_TRUE(web_contents); - InfoBarManager* infobar_manager = - InfoBarService::FromWebContents(web_contents)->infobar_manager(); - ASSERT_EQ(1U, infobar_manager->infobar_count()); + InfoBarService* infobar_service = + InfoBarService::FromWebContents(web_contents); + ASSERT_EQ(1U, infobar_service->infobar_count()); ConfirmInfoBarDelegate* delegate = - infobar_manager->infobar_at(0)->delegate()->AsConfirmInfoBarDelegate(); + infobar_service->infobar_at(0)->delegate()->AsConfirmInfoBarDelegate(); ASSERT_TRUE(delegate); delegate->Cancel(); - ASSERT_EQ(0U, infobar_manager->infobar_count()); + ASSERT_EQ(0U, infobar_service->infobar_count()); } // Install the given theme from the data dir and verify expected name. |