chrome/browser/browsing_data/browsing_data_remover_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/browsing_data/browsing_data_remover_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: address review comments, minor change 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

« no previous file with comments | « chrome/browser/android/preferences/pref_service_bridge.cc ('k') | chrome/browser/content_settings/content_settings_default_provider_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/browsing_data/browsing_data_remover_unittest.cc

diff --git a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc

index fb75dbf8c6bc1e84a2a3cb0752a039d07b138df3..b2855bd85cc041e65975bb0b8dd65b149b42bb51 100644

--- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc

+++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc

@@ -2479,21 +2479,21 @@ TEST_F(BrowsingDataRemoverTest, ClearWithPredicate) {

host_content_settings_map->SetContentSettingCustomScope(

pattern2, ContentSettingsPattern::Wildcard(),

- CONTENT_SETTINGS_TYPE_IMAGES, std::string(), CONTENT_SETTING_BLOCK);

+ CONTENT_SETTINGS_TYPE_COOKIES, std::string(), CONTENT_SETTING_BLOCK);

host_content_settings_map->SetContentSettingCustomScope(

- pattern, ContentSettingsPattern::Wildcard(), CONTENT_SETTINGS_TYPE_IMAGES,

- std::string(), CONTENT_SETTING_BLOCK);

+ pattern, ContentSettingsPattern::Wildcard(),

+ CONTENT_SETTINGS_TYPE_COOKIES, std::string(), CONTENT_SETTING_BLOCK);

host_content_settings_map->SetWebsiteSettingCustomScope(

pattern2, ContentSettingsPattern::Wildcard(),

CONTENT_SETTINGS_TYPE_APP_BANNER, std::string(),

base::WrapUnique(new base::DictionaryValue()));

- // First, test that we clear only IMAGES (not APP_BANNER), and pattern2.

+ // First, test that we clear only COOKIES (not APP_BANNER), and pattern2.

BrowsingDataRemover::ClearSettingsForOneTypeWithPredicate(

- host_content_settings_map, CONTENT_SETTINGS_TYPE_IMAGES,

+ host_content_settings_map, CONTENT_SETTINGS_TYPE_COOKIES,

base::Bind(&MatchPrimaryPattern, pattern2));

host_content_settings_map->GetSettingsForOneType(

- CONTENT_SETTINGS_TYPE_IMAGES, std::string(), &host_settings);

+ CONTENT_SETTINGS_TYPE_COOKIES, std::string(), &host_settings);

// |host_settings| contains default & block.

EXPECT_EQ(2U, host_settings.size());

EXPECT_EQ(pattern, host_settings[0].primary_pattern);