Remove content dependencies from content settings providers.

chrome/browser/content_settings/content_settings_internal_extension_provider.cc

 // Copyright (c) 2013 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_internal_extension_provider.h"
 
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/extensions/api/plugins/plugins_handler.h"
 #include "components/content_settings/core/browser/content_settings_rule.h"
@@ skipping 137 matching lines @@
       if (extensions::PluginInfo::HasPlugins(info.extension))
         SetContentSettingForExtension(info.extension, CONTENT_SETTING_DEFAULT);
       break;
     }
     default:
       NOTREACHED();
   }
 }
 
 void InternalExtensionProvider::ShutdownOnUIThread() {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK(CalledOnValidThread());
   RemoveAllObservers();
   registrar_.reset();
 }
 
 void InternalExtensionProvider::SetContentSettingForExtension(
     const extensions::Extension* extension,
     ContentSetting setting) {
   SetContentSettingForExtensionAndResource(
       extension, ResourceIdentifier(), setting);
 }
@@ skipping 25 matching lines @@
                           new base::FundamentalValue(setting));
     }
   }
   NotifyObservers(primary_pattern,
                   secondary_pattern,
                   CONTENT_SETTINGS_TYPE_PLUGINS,
                   resource);
 }
 
 }  // namespace content_settings