Index: chrome/browser/content_settings/content_settings_default_provider.cc |
diff --git a/chrome/browser/content_settings/content_settings_default_provider.cc b/chrome/browser/content_settings/content_settings_default_provider.cc |
index 6ee9c2c116ebadd123de6a4127883a77f56b4d98..a7b397e092e088da12bc6b543f9aa1a578bd0f23 100644 |
--- a/chrome/browser/content_settings/content_settings_default_provider.cc |
+++ b/chrome/browser/content_settings/content_settings_default_provider.cc |
@@ -20,11 +20,8 @@ |
#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" |
#include "url/gurl.h" |
-using content::BrowserThread; |
- |
namespace { |
// The default setting for each content type. |
@@ -187,7 +184,7 @@ bool DefaultProvider::SetWebsiteSetting( |
ContentSettingsType content_type, |
const ResourceIdentifier& resource_identifier, |
base::Value* in_value) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK(CalledOnValidThread()); |
DCHECK(prefs_); |
// Ignore non default settings |
@@ -266,7 +263,7 @@ void DefaultProvider::ClearAllContentSettingsRules( |
} |
void DefaultProvider::ShutdownOnUIThread() { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK(CalledOnValidThread()); |
DCHECK(prefs_); |
RemoveAllObservers(); |
pref_change_registrar_.RemoveAll(); |
@@ -274,7 +271,7 @@ void DefaultProvider::ShutdownOnUIThread() { |
} |
void DefaultProvider::OnPreferenceChanged(const std::string& name) { |
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ DCHECK(CalledOnValidThread()); |
if (updating_preferences_) |
return; |