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/test/gpu | |
| 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/test/gpu')
| -rw-r--r-- | chrome/test/gpu/webgl_infobar_browsertest.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/chrome/test/gpu/webgl_infobar_browsertest.cc b/chrome/test/gpu/webgl_infobar_browsertest.cc index 9d376d3..8040cae 100644 --- a/chrome/test/gpu/webgl_infobar_browsertest.cc +++ b/chrome/test/gpu/webgl_infobar_browsertest.cc @@ -8,7 +8,6 @@ #include "chrome/browser/chrome_notification_types.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/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" @@ -91,8 +90,8 @@ IN_PROC_BROWSER_TEST_F(WebGLInfoBarTest, DISABLED_ContextLossRaisesInfoBar) { infobar_added.Wait(); EXPECT_EQ(1u, InfoBarService::FromWebContents( - browser()->tab_strip_model()->GetActiveWebContents()) - ->infobar_manager()->infobar_count()); + browser()->tab_strip_model()->GetActiveWebContents())-> + infobar_count()); } // This test is flaky. http://crbug.com/324555 @@ -132,9 +131,8 @@ IN_PROC_BROWSER_TEST_F(WebGLInfoBarTest, DISABLED_ContextLossInfoBarReload) { infobar_added.Wait(); InfoBarService* infobar_service = InfoBarService::FromWebContents( browser()->tab_strip_model()->GetActiveWebContents()); - ASSERT_EQ(1u, infobar_service->infobar_manager()->infobar_count()); - InfoBarDelegate* delegate = - infobar_service->infobar_manager()->infobar_at(0)->delegate(); + ASSERT_EQ(1u, infobar_service->infobar_count()); + InfoBarDelegate* delegate = infobar_service->infobar_at(0)->delegate(); ASSERT_EQ(IDR_INFOBAR_3D_BLOCKED, delegate->GetIconID()); delegate->AsConfirmInfoBarDelegate()->Cancel(); |