chrome/browser/ui/website_settings/website_settings_unittest.cc - Issue 2039803002: Unregister Images, Plugins and Mouselock content settings on android

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 2039803002: Unregister Images, Plugins and Mouselock content settings on android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@only_register_platform_used_contentsettingtypes

Patch Set: Created 4 years, 6 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/content_settings/host_content_settings_map_unittest.cc ('K') | « chrome/browser/ui/website_settings/website_settings.cc ('k') | chrome/renderer/content_settings_observer.cc » ('j') | components/content_settings/core/browser/content_settings_pref_provider.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 fa24205d3bf5fb78375e0fd159d4e13d88c1d532..3d9fd0fc12a6c35e89c352d6afd6088d4cf4d34a 100644

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

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

@@ -230,15 +230,22 @@ TEST_F(WebsiteSettingsTest, OnPermissionsChanged) {

// SetPermissionInfo() is called once initially, and then again every time

// OnSitePermissionChanged() is called.

+#if defined(OS_ANDROID)

raymes 2016/06/07 01:40:44 Should we have #if !defined(ENABLE_PLUGINS) ?

lshang 2016/06/07 06:40:00 Done.

+ // SetPermissionInfo for plugins didn't get called.

+ EXPECT_CALL(*mock_ui(), SetPermissionInfo(_, _)).Times(6);

+#else

EXPECT_CALL(*mock_ui(), SetPermissionInfo(_, _)).Times(7);

+#endif

EXPECT_CALL(*mock_ui(), SetSelectedTab(

WebsiteSettingsUI::TAB_ID_PERMISSIONS));

// Execute code under tests.

website_settings()->OnSitePermissionChanged(CONTENT_SETTINGS_TYPE_POPUPS,

CONTENT_SETTING_ALLOW);

+#if defined(ENABLE_PLUGINS)

website_settings()->OnSitePermissionChanged(CONTENT_SETTINGS_TYPE_PLUGINS,

CONTENT_SETTING_BLOCK);

+#endif

website_settings()->OnSitePermissionChanged(CONTENT_SETTINGS_TYPE_GEOLOCATION,

CONTENT_SETTING_ALLOW);

website_settings()->OnSitePermissionChanged(

@@ -252,9 +259,11 @@ TEST_F(WebsiteSettingsTest, OnPermissionsChanged) {

setting = content_settings->GetContentSetting(

url(), url(), CONTENT_SETTINGS_TYPE_POPUPS, std::string());

EXPECT_EQ(setting, CONTENT_SETTING_ALLOW);

+#if defined(ENABLE_PLUGINS)

setting = content_settings->GetContentSetting(

url(), url(), CONTENT_SETTINGS_TYPE_PLUGINS, std::string());

EXPECT_EQ(setting, CONTENT_SETTING_BLOCK);

+#endif

setting = content_settings->GetContentSetting(

url(), url(), CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string());

EXPECT_EQ(setting, CONTENT_SETTING_ALLOW);