components/content_settings/core/browser/content_settings_registry_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: components/content_settings/core/browser/content_settings_registry_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

« components/content_settings/core/browser/content_settings_pref_provider.cc ('K') | « components/content_settings/core/browser/content_settings_registry.cc ('k') | components/content_settings/core/browser/content_settings_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/content_settings/core/browser/content_settings_registry_unittest.cc

diff --git a/components/content_settings/core/browser/content_settings_registry_unittest.cc b/components/content_settings/core/browser/content_settings_registry_unittest.cc

index 1a9af1c6be26db3dfbfbcb9e7f88bca6f86630e2..c9d945c10165db7d298b195df9075de1a3de9265 100644

--- a/components/content_settings/core/browser/content_settings_registry_unittest.cc

+++ b/components/content_settings/core/browser/content_settings_registry_unittest.cc

@@ -38,6 +38,11 @@ TEST_F(ContentSettingsRegistryTest, GetPlatformDependent) {

EXPECT_FALSE(registry()->Get(CONTENT_SETTINGS_TYPE_JAVASCRIPT));

#endif

+#if defined(OS_IOS) | defined(OS_ANDROID)

raymes 2016/06/07 01:40:44 || instead of |

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

+ // Images shouldn't be registered on mobile.

+ EXPECT_FALSE(registry()->Get(CONTENT_SETTINGS_TYPE_IMAGES));

+#endif

// Protected media identifier only get registered on android and chromeos.

#if defined(ANDROID) | defined(OS_CHROMEOS)

EXPECT_TRUE(

@@ -110,7 +115,7 @@ TEST_F(ContentSettingsRegistryTest, Iteration) {

}

-#if defined(OS_IOS)

+#if defined(OS_ANDROID) || defined(OS_IOS)

EXPECT_FALSE(plugins_found);

#else

EXPECT_TRUE(plugins_found);