Remove content dependencies from content settings providers.

chrome/browser/content_settings/host_content_settings_map.cc

Index: chrome/browser/content_settings/host_content_settings_map.cc
diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc
index d0554547abe9a2f0f48b26b1be783dc4a7432c42..7c8e715e003c002e3e3175be39f664fc60062771 100644
--- a/chrome/browser/content_settings/host_content_settings_map.cc
+++ b/chrome/browser/content_settings/host_content_settings_map.cc
@@ -26,8 +26,6 @@
 #include "components/content_settings/core/browser/content_settings_rule.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 "content/public/common/content_switches.h"
 #include "net/base/net_errors.h"
 #include "net/base/static_cookie_policy.h"
 #include "url/gurl.h"
@@ -36,8 +34,6 @@
 #include "extensions/common/constants.h"
 #endif
 
-using content::BrowserThread;
-
 namespace {
 
 typedef std::vector<content_settings::Rule> Rules;
@@ -128,6 +124,7 @@ void HostContentSettingsMap::RegisterProfilePrefs(
 void HostContentSettingsMap::RegisterProvider(
     ProviderType type,
     scoped_ptr<content_settings::ObservableProvider> provider) {
+  DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!content_settings_providers_[type]);
   provider->AddObserver(this);
   content_settings_providers_[type] = provider.release();
@@ -328,7 +325,7 @@ ContentSetting HostContentSettingsMap::GetContentSettingAndMaybeUpdateLastUsage(
     const GURL& secondary_url,
     ContentSettingsType content_type,
     const std::string& resource_identifier) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(thread_checker_.CalledOnValidThread());
 
   ContentSetting setting = GetContentSetting(
       primary_url, secondary_url, content_type, resource_identifier);
@@ -577,7 +574,7 @@ HostContentSettingsMap::~HostContentSettingsMap() {
 }
 
 void HostContentSettingsMap::ShutdownOnUIThread() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(prefs_);
   prefs_ = NULL;
   for (ProviderIterator it = content_settings_providers_.begin();