chrome/browser/content_settings/content_settings_internal_extension_provider.cc - Issue 596613002: Remove content dependencies from content settings providers.

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_internal_extension_provider.cc

Issue 596613002: Remove content dependencies from content settings providers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: shutdown fix 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

« chrome/browser/content_settings/content_settings_default_provider.cc ('K') | « chrome/browser/content_settings/content_settings_default_provider_unittest.cc ('k') | chrome/browser/content_settings/content_settings_override_provider.cc » ('j') | chrome/browser/content_settings/content_settings_policy_provider_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_internal_extension_provider.cc

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

index 6e65b80670debe36531a71fa9747f607d171e42e..be8a6ea23b546fe6f97b005bae00ffd224ada6f2 100644

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

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

@@ -155,7 +155,7 @@ void InternalExtensionProvider::Observe(int type,

}

void InternalExtensionProvider::ShutdownOnUIThread() {

- DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));

+ DCHECK(CalledOnValidThread());

RemoveAllObservers();

registrar_.reset();

}