chrome/browser/content_settings/content_settings_pref_provider_unittest.cc - Issue 8538004: Take script URLs into account when applying script content settings.

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/content_settings_pref_provider_unittest.cc

Issue 8538004: Take script URLs into account when applying script content settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased. Created 9 years, 1 month 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/content_settings_default_provider.cc ('k') | chrome/browser/content_settings/content_settings_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_pref_provider_unittest.cc

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

index 50e56ff33e2d45e30f7f8eb2b308a789f08b9551..edefe9785c705ff048eb2c62226d6b68b6467b62 100644

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

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

@@ -53,15 +53,6 @@ void ExpectObsoleteGeolocationSetting(

namespace content_settings {

-bool SettingsEqual(const ContentSettings& settings1,

- const ContentSettings& settings2) {

- for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) {

- if (settings1.settings[i] != settings2.settings[i])

- return false;

- }

- return true;

class DeadlockCheckerThread : public base::PlatformThread::Delegate {

public:

explicit DeadlockCheckerThread(PrefProvider* provider)