components/content_settings/core/browser/content_settings_registry_unittest.cc - Issue 2123863004: ScreenCapture for Android phase1, part II

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 2123863004: ScreenCapture for Android phase1, part II (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix problem with adding content setting type Created 4 years, 5 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 | « components/content_settings/core/browser/content_settings_registry.cc ('k') | components/content_settings/core/common/content_settings.cc » ('j') | components/content_settings/core/common/content_settings.cc » ('J')
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 7b8d66203ce9c25c99768f1a023cb4cbb5ff8bd0..0cc70856684f3232fbd407934cd2f9e20198a710 100644

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

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

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

registry()->Get(CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER));

#endif

+#if defined(OS_ANDROID)

+ // Media stream screen only gets registered on android.

+ EXPECT_TRUE(registry()->Get(CONTENT_SETTINGS_TYPE_MEDIASTREAM_SCREEN));

+#endif

raymes 2016/07/13 02:44:09 nit: this should have an #else too (as above)

braveyao 2016/07/13 19:51:57 Done.

// Cookies is registered on all platforms.

EXPECT_TRUE(registry()->Get(CONTENT_SETTINGS_TYPE_COOKIES));

}