chrome/browser/content_settings/host_content_settings_map_unittest.cc - Issue 535773002: Android: Remove more browser extensions code, including some that snuck back in.

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/content_settings/host_content_settings_map_unittest.cc

Issue 535773002: Android: Remove more browser extensions code, including some that snuck back in. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 6 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

« no previous file with comments | « chrome/browser/content_settings/host_content_settings_map.cc ('k') | chrome/browser/download/download_crx_util_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/host_content_settings_map_unittest.cc

diff --git a/chrome/browser/content_settings/host_content_settings_map_unittest.cc b/chrome/browser/content_settings/host_content_settings_map_unittest.cc

index ec7cb9bbb89f51592fdf7183399311934fc268bd..9aaf801cd75c4113f7961b6a496880579371c6c7 100644

--- a/chrome/browser/content_settings/host_content_settings_map_unittest.cc

+++ b/chrome/browser/content_settings/host_content_settings_map_unittest.cc

@@ -935,8 +935,13 @@ TEST_F(HostContentSettingsMapTest, ShouldAllowAllContent) {

https_host, embedder, CONTENT_SETTINGS_TYPE_COOKIES));

EXPECT_TRUE(host_content_settings_map->ShouldAllowAllContent(

embedder, http_host, CONTENT_SETTINGS_TYPE_COOKIES));

+#if defined(ENABLE_EXTENSIONS)

EXPECT_TRUE(host_content_settings_map->ShouldAllowAllContent(

extension, extension, CONTENT_SETTINGS_TYPE_COOKIES));

+#else

+ EXPECT_FALSE(host_content_settings_map->ShouldAllowAllContent(

+ extension, extension, CONTENT_SETTINGS_TYPE_COOKIES));

+#endif

EXPECT_FALSE(host_content_settings_map->ShouldAllowAllContent(

extension, extension, CONTENT_SETTINGS_TYPE_PLUGINS));

EXPECT_FALSE(host_content_settings_map->ShouldAllowAllContent(