chrome/test/base/testing_profile.cc - Issue 615083004: Use ThreadChecker rather than DCHECK_CURRENTLY_ON.

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/test/base/testing_profile.cc

Issue 615083004: Use ThreadChecker rather than DCHECK_CURRENTLY_ON. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix Created 6 years, 2 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:

Index: chrome/test/base/testing_profile.cc

diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc

index 64d44dadcb5baeec2ba9eceff83d560f65d23a2f..878d2a4b4121e8882026d4ee233da2bd6eab8e47 100644

--- a/chrome/test/base/testing_profile.cc

+++ b/chrome/test/base/testing_profile.cc

@@ -830,6 +830,9 @@ content::ResourceContext* TestingProfile::GetResourceContext() {

}

HostContentSettingsMap* TestingProfile::GetHostContentSettingsMap() {

+ DCHECK(!content::BrowserThread::IsThreadInitialized(

+ content::BrowserThread::UI) ||

+ content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));

if (!host_content_settings_map_.get()) {

host_content_settings_map_ = new HostContentSettingsMap(GetPrefs(), false);

#if defined(ENABLE_EXTENSIONS)