Remove content dependencies from content settings providers.

chrome/browser/content_settings/content_settings_override_provider.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/content_settings/content_settings_override_provider.h"
 
 #include <string>
 
 #include "base/auto_reset.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/values.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/common/pref_names.h"
 #include "components/content_settings/core/browser/content_settings_rule.h"
 #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 {
 
 namespace {
 
 class OverrideRuleIterator : public RuleIterator {
  public:
   explicit OverrideRuleIterator(bool is_allowed) : is_done_(is_allowed) {}
 
   virtual bool HasNext() const OVERRIDE { return !is_done_; }
@@ skipping 55 matching lines @@
   return false;
 }
 
 void OverrideProvider::ShutdownOnUIThread() {
   DCHECK(prefs_);
   prefs_ = NULL;
 }
 
 void OverrideProvider::SetOverrideSetting(ContentSettingsType content_type,
                                           bool enabled) {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(CalledOnValidThread());
   DCHECK(prefs_);
 
   // Disallow incognito to change the state.
   DCHECK(!is_incognito_);
 
   base::AutoLock lock(lock_);
   DictionaryPrefUpdate update(prefs_, prefs::kOverrideContentSettings);
   base::DictionaryValue* default_settings_dictionary = update.Get();
   if (enabled) {
     allowed_settings_[content_type] = true;
     default_settings_dictionary->RemoveWithoutPathExpansion(
         GetTypeName(content_type), NULL);
   } else {
     allowed_settings_[content_type] = false;
     default_settings_dictionary->SetWithoutPathExpansion(
         GetTypeName(content_type), new base::FundamentalValue(true));
   }
 }
 
 bool OverrideProvider::IsEnabled(ContentSettingsType content_type) const {
   base::AutoLock lock(lock_);
   return allowed_settings_[content_type];
 }
 
 void OverrideProvider::ReadOverrideSettings() {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(CalledOnValidThread());
   const base::DictionaryValue* blocked_settings_dictionary =
       prefs_->GetDictionary(prefs::kOverrideContentSettings);
 
   for (int type = 0; type < CONTENT_SETTINGS_NUM_TYPES; ++type) {
     ContentSettingsType content_setting = ContentSettingsType(type);
     allowed_settings_[content_setting] =
         !blocked_settings_dictionary->HasKey(GetTypeName(content_setting));
   }
 }
 
 }  // namespace content_settings