components/content_settings/core/browser/content_settings_registry_unittest.cc - Issue 2307393002: Stop syncing 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 2307393002: Stop syncing content settings on Android

Patch Set: Created 4 years, 3 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

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..bf595c44e039dcd0a558d27a3c65bd93af9a1e74 100644

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

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

@@ -86,7 +86,7 @@ TEST_F(ContentSettingsRegistryTest, Properties) {

ASSERT_TRUE(

website_settings_info->initial_default_value()->GetAsInteger(&setting));

EXPECT_EQ(CONTENT_SETTING_ALLOW, setting);

-#if defined(OS_IOS)

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

EXPECT_EQ(PrefRegistry::NO_REGISTRATION_FLAGS,

website_settings_info->GetPrefRegistrationFlags());

#else

« no previous file with comments | « no previous file | components/content_settings/core/browser/website_settings_registry.cc » ('j') | no next file with comments »