chrome/browser/ui/website_settings/website_settings_unittest.cc - Issue 228293004: InfoBarService inherits from InfoBarManager

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/website_settings/website_settings_unittest.cc

Issue 228293004: InfoBarService inherits from InfoBarManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: whitespace Created 6 years, 8 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

« chrome/browser/translate/translate_manager_render_view_host_unittest.cc ('K') | « chrome/browser/ui/views/frame/browser_view.cc ('k') | chrome/test/gpu/webgl_infobar_browsertest.cc » ('j') | chrome/test/gpu/webgl_infobar_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 8f1645c84ea7328cbfb7c98e5aaafeeb1cb1c2ab..fd1c6221954a1ba08340bf9bb4553e3491f7ce0a 100644

--- a/chrome/browser/ui/website_settings/website_settings_unittest.cc

+++ b/chrome/browser/ui/website_settings/website_settings_unittest.cc

@@ -13,7 +13,6 @@

#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"

@@ -365,9 +364,9 @@ TEST_F(WebsiteSettingsTest, NoInfoBar) {

SetDefaultUIExpectations(mock_ui());

EXPECT_CALL(*mock_ui(), SetSelectedTab(

WebsiteSettingsUI::TAB_ID_PERMISSIONS));

- EXPECT_EQ(0u, infobar_service()->infobar_manager()->infobar_count());

+ EXPECT_EQ(0u, infobar_service()->infobar_count());

website_settings()->OnUIClosing();

- EXPECT_EQ(0u, infobar_service()->infobar_manager()->infobar_count());

+ EXPECT_EQ(0u, infobar_service()->infobar_count());

}

TEST_F(WebsiteSettingsTest, ShowInfoBar) {

@@ -387,12 +386,11 @@ TEST_F(WebsiteSettingsTest, ShowInfoBar) {

EXPECT_CALL(*mock_ui(), SetSelectedTab(

WebsiteSettingsUI::TAB_ID_PERMISSIONS));

- InfoBarManager* infobar_manager = infobar_service()->infobar_manager();

- EXPECT_EQ(0u, infobar_manager->infobar_count());

+ EXPECT_EQ(0u, infobar_service()->infobar_count());

website_settings()->OnSitePermissionChanged(

CONTENT_SETTINGS_TYPE_GEOLOCATION, CONTENT_SETTING_ALLOW);

website_settings()->OnUIClosing();

- ASSERT_EQ(1u, infobar_manager->infobar_count());

+ ASSERT_EQ(1u, infobar_service()->infobar_count());

- infobar_manager->RemoveInfoBar(infobar_manager->infobar_at(0));

+ infobar_service()->RemoveInfoBar(infobar_service()->infobar_at(0));

}