Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6902)

Unified Diff: chrome/test/ppapi/ppapi_test.cc

Issue 211273007: Split InfoBarService core code into InfoBarManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase + comments Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/gpu/webgl_infobar_browsertest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/ppapi/ppapi_test.cc
diff --git a/chrome/test/ppapi/ppapi_test.cc b/chrome/test/ppapi/ppapi_test.cc
index 96a27ad35379b9a333c6d64e15126db458f6dc89..420a104cb27af8dd9acbe147453c53adae804139 100644
--- a/chrome/test/ppapi/ppapi_test.cc
+++ b/chrome/test/ppapi/ppapi_test.cc
@@ -13,6 +13,8 @@
#include "chrome/browser/content_settings/host_content_settings_map.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/ui/browser.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ -109,12 +111,13 @@ void PPAPITestBase::InfoBarObserver::VerifyInfoBarState() {
InfoBarService::FromWebContents(web_contents);
ASSERT_TRUE(infobar_service != NULL);
- EXPECT_EQ(expecting_infobar_ ? 1U : 0U, infobar_service->infobar_count());
+ InfoBarManager* infobar_manager = infobar_service->infobar_manager();
+ EXPECT_EQ(expecting_infobar_ ? 1U : 0U, infobar_manager->infobar_count());
if (!expecting_infobar_)
return;
expecting_infobar_ = false;
- InfoBar* infobar = infobar_service->infobar_at(0);
+ InfoBar* infobar = infobar_manager->infobar_at(0);
ConfirmInfoBarDelegate* delegate =
infobar->delegate()->AsConfirmInfoBarDelegate();
ASSERT_TRUE(delegate != NULL);
@@ -123,7 +126,7 @@ void PPAPITestBase::InfoBarObserver::VerifyInfoBarState() {
else
delegate->Cancel();
- infobar_service->RemoveInfoBar(infobar);
+ infobar_manager->RemoveInfoBar(infobar);
}
PPAPITestBase::PPAPITestBase() {
« no previous file with comments | « chrome/test/gpu/webgl_infobar_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698