Remove content dependencies from content settings providers.

chrome/browser/content_settings/content_settings_policy_provider.cc

 // Copyright (c) 2012 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_policy_provider.h"
 
 #include <string>
 #include <vector>
 
+#include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/prefs/pref_service.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_pattern.h"
 #include "components/pref_registry/pref_registry_syncable.h"
-#include "content/public/browser/browser_thread.h"
-
-using content::BrowserThread;
 
 namespace {
 
 // The preferences used to manage ContentSettingsTypes.
 const char* kPrefToManageType[] = {
   prefs::kManagedDefaultCookiesSetting,
   prefs::kManagedDefaultImagesSetting,
   prefs::kManagedDefaultJavaScriptSetting,
   prefs::kManagedDefaultPluginsSetting,
   prefs::kManagedDefaultPopupsSetting,
@@ skipping 405 matching lines @@
     const ResourceIdentifier& resource_identifier,
     base::Value* value) {
   return false;
 }
 
 void PolicyProvider::ClearAllContentSettingsRules(
     ContentSettingsType content_type) {
 }
 
 void PolicyProvider::ShutdownOnUIThread() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK(CalledOnValidThread());
   RemoveAllObservers();
   if (!prefs_)
     return;
   pref_change_registrar_.RemoveAll();
   prefs_ = NULL;
 }
 
 void PolicyProvider::OnPreferenceChanged(const std::string& name) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK(CalledOnValidThread());
 
   if (name == prefs::kManagedDefaultCookiesSetting) {
     UpdateManagedDefaultSetting(CONTENT_SETTINGS_TYPE_COOKIES);
   } else if (name == prefs::kManagedDefaultImagesSetting) {
     UpdateManagedDefaultSetting(CONTENT_SETTINGS_TYPE_IMAGES);
   } else if (name == prefs::kManagedDefaultJavaScriptSetting) {
     UpdateManagedDefaultSetting(CONTENT_SETTINGS_TYPE_JAVASCRIPT);
   } else if (name == prefs::kManagedDefaultPluginsSetting) {
     UpdateManagedDefaultSetting(CONTENT_SETTINGS_TYPE_PLUGINS);
   } else if (name == prefs::kManagedDefaultPopupsSetting) {
@@ skipping 22 matching lines @@
     ReadManagedDefaultSettings();
   }
 
   NotifyObservers(ContentSettingsPattern(),
                   ContentSettingsPattern(),
                   CONTENT_SETTINGS_TYPE_DEFAULT,
                   std::string());
 }
 
 }  // namespace content_settings