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

Unified Diff: chrome/browser/content_settings/content_settings_override_provider.cc

Issue 615083004: Use ThreadChecker rather than DCHECK_CURRENTLY_ON. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: DCHECK testing_profile 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/browser/content_settings/content_settings_override_provider.cc
diff --git a/chrome/browser/content_settings/content_settings_override_provider.cc b/chrome/browser/content_settings/content_settings_override_provider.cc
index d0682853119080e87fc2674467d81c5132d051ab..659096a488b36fee173d075a0ce0771cfc8a5ec8 100644
--- a/chrome/browser/content_settings/content_settings_override_provider.cc
+++ b/chrome/browser/content_settings/content_settings_override_provider.cc
@@ -16,9 +16,6 @@
#include "components/content_settings/core/common/content_settings.h"
#include "components/content_settings/core/common/content_settings_pattern.h"
#include "components/pref_registry/pref_registry_syncable.h"
-#include "content/public/browser/browser_thread.h"
-
-using content::BrowserThread;
namespace content_settings {
@@ -94,7 +91,7 @@ void OverrideProvider::ShutdownOnUIThread() {
void OverrideProvider::SetOverrideSetting(ContentSettingsType content_type,
bool enabled) {
- DCHECK_CURRENTLY_ON(BrowserThread::UI);
+ DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(prefs_);
// Disallow incognito to change the state.
@@ -120,7 +117,6 @@ bool OverrideProvider::IsEnabled(ContentSettingsType content_type) const {
}
void OverrideProvider::ReadOverrideSettings() {
- DCHECK_CURRENTLY_ON(BrowserThread::UI);
const base::DictionaryValue* blocked_settings_dictionary =
prefs_->GetDictionary(prefs::kOverrideContentSettings);

Powered by Google App Engine
This is Rietveld 408576698