chrome/browser/content_settings/mock_settings_observer.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/mock_settings_observer.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:

Index: chrome/browser/content_settings/mock_settings_observer.cc

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

index a0cc5b123864f9a7cf4198e497d8a8fdb0d16e9e..a281a1deb90199f3340a921cf0f7349a5e92951a 100644

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

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

@@ -34,5 +34,6 @@ void MockSettingsObserver::Observe(

settings_details->update_all());

// This checks that calling a Get function from an observer doesn't

// deadlock.

- map->GetContentSettings(GURL("http://random-hostname.com/"));

+ GURL url("http://random-hostname.com/");

+ map->GetContentSetting(url, url, CONTENT_SETTINGS_TYPE_IMAGES, "");

}