Index: chrome/browser/ui/website_settings/website_settings_unittest.cc |
diff --git a/chrome/browser/ui/website_settings/website_settings_unittest.cc b/chrome/browser/ui/website_settings/website_settings_unittest.cc |
index fd1c6221954a1ba08340bf9bb4553e3491f7ce0a..8f1645c84ea7328cbfb7c98e5aaafeeb1cb1c2ab 100644 |
--- a/chrome/browser/ui/website_settings/website_settings_unittest.cc |
+++ b/chrome/browser/ui/website_settings/website_settings_unittest.cc |
@@ -13,6 +13,7 @@ |
#include "chrome/browser/content_settings/host_content_settings_map.h" |
#include "chrome/browser/content_settings/tab_specific_content_settings.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/website_settings/website_settings_ui.h" |
#include "chrome/common/content_settings.h" |
@@ -364,9 +365,9 @@ TEST_F(WebsiteSettingsTest, NoInfoBar) { |
SetDefaultUIExpectations(mock_ui()); |
EXPECT_CALL(*mock_ui(), SetSelectedTab( |
WebsiteSettingsUI::TAB_ID_PERMISSIONS)); |
- EXPECT_EQ(0u, infobar_service()->infobar_count()); |
+ EXPECT_EQ(0u, infobar_service()->infobar_manager()->infobar_count()); |
website_settings()->OnUIClosing(); |
- EXPECT_EQ(0u, infobar_service()->infobar_count()); |
+ EXPECT_EQ(0u, infobar_service()->infobar_manager()->infobar_count()); |
} |
TEST_F(WebsiteSettingsTest, ShowInfoBar) { |
@@ -386,11 +387,12 @@ TEST_F(WebsiteSettingsTest, ShowInfoBar) { |
EXPECT_CALL(*mock_ui(), SetSelectedTab( |
WebsiteSettingsUI::TAB_ID_PERMISSIONS)); |
- EXPECT_EQ(0u, infobar_service()->infobar_count()); |
+ InfoBarManager* infobar_manager = infobar_service()->infobar_manager(); |
+ EXPECT_EQ(0u, infobar_manager->infobar_count()); |
website_settings()->OnSitePermissionChanged( |
CONTENT_SETTINGS_TYPE_GEOLOCATION, CONTENT_SETTING_ALLOW); |
website_settings()->OnUIClosing(); |
- ASSERT_EQ(1u, infobar_service()->infobar_count()); |
+ ASSERT_EQ(1u, infobar_manager->infobar_count()); |
- infobar_service()->RemoveInfoBar(infobar_service()->infobar_at(0)); |
+ infobar_manager->RemoveInfoBar(infobar_manager->infobar_at(0)); |
} |