Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3988)

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: comment 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:
View side-by-side diff with in-line comments
Download patch
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(
Paweł Hajdan Jr. 2014/10/20 09:11:51 This seems the only place in this patch where IsTh
Jun Mukai 2014/10/20 17:02:51 I copied this check from TestingProfile::Init().
Paweł Hajdan Jr. 2014/10/21 09:30:58 If it's really needed, please extract it to a comm
Jun Mukai 2014/10/22 06:30:13 Tried and I was wrong. Changed to use DCHECK_CURRE
+ 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)

Powered by Google App Engine
This is Rietveld 408576698