Remove content dependencies from content settings providers.

chrome/browser/content_settings/content_settings_default_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_default_provider.h"
 
 #include <string>
 #include <vector>
 
 #include "base/auto_reset.h"
 #include "base/basictypes.h"
+#include "base/bind.h"

[vabr (Chromium), 2014/09/23 07:51:00]

Why did you include this?
(Also in other files.)

[Jun Mukai, 2014/09/23 20:48:44]

Bind is used below (line 173 in this file).  It was implicitly included through
browser_thread.h (browser_thread.h -> base/task_runner_util.h -> base/bind.h)

[vabr (Chromium), 2014/09/24 09:56:39]

Thanks for explanation, makes sense.

 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
-#include "chrome/browser/chrome_notification_types.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"
-#include "content/public/browser/notification_details.h"
-#include "content/public/browser/notification_source.h"
-#include "content/public/browser/user_metrics.h"
 #include "url/gurl.h"
 
-using base::UserMetricsAction;
-using content::BrowserThread;
-
 namespace {
 
 // The default setting for each content type.
 const ContentSetting kDefaultSettings[] = {
   CONTENT_SETTING_ALLOW,    // CONTENT_SETTINGS_TYPE_COOKIES
   CONTENT_SETTING_ALLOW,    // CONTENT_SETTINGS_TYPE_IMAGES
   CONTENT_SETTING_ALLOW,    // CONTENT_SETTINGS_TYPE_JAVASCRIPT
   CONTENT_SETTING_ALLOW,    // CONTENT_SETTINGS_TYPE_PLUGINS
   CONTENT_SETTING_BLOCK,    // CONTENT_SETTINGS_TYPE_POPUPS
   CONTENT_SETTING_ASK,      // CONTENT_SETTINGS_TYPE_GEOLOCATION
@@ skipping 142 matching lines @@
 
 DefaultProvider::~DefaultProvider() {
 }
 
 bool DefaultProvider::SetWebsiteSetting(
     const ContentSettingsPattern& primary_pattern,
     const ContentSettingsPattern& secondary_pattern,
     ContentSettingsType content_type,
     const ResourceIdentifier& resource_identifier,
     base::Value* in_value) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK(CalledOnValidThread());
   DCHECK(prefs_);
 
   // Ignore non default settings
   if (primary_pattern != ContentSettingsPattern::Wildcard() ||
       secondary_pattern != ContentSettingsPattern::Wildcard()) {
     return false;
   }
 
   // The default settings may not be directly modified for OTR sessions.
   // Instead, they are synced to the main profile's setting.
@@ skipping 58 matching lines @@
 
 void DefaultProvider::ClearAllContentSettingsRules(
     ContentSettingsType content_type) {
   // TODO(markusheintz): This method is only called when the
   // |DesktopNotificationService| calls |ClearAllSettingsForType| method on the
   // |HostContentSettingsMap|. Don't implement this method yet, otherwise the
   // default notification settings will be cleared as well.
 }
 
 void DefaultProvider::ShutdownOnUIThread() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK(CalledOnValidThread());
   DCHECK(prefs_);
   RemoveAllObservers();
   pref_change_registrar_.RemoveAll();
   prefs_ = NULL;
 }
 
 void DefaultProvider::OnPreferenceChanged(const std::string& name) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK(CalledOnValidThread());
   if (updating_preferences_)
     return;
 
   if (name == prefs::kDefaultContentSettings) {
     ReadDefaultSettings(true);
   } else {
     NOTREACHED() << "Unexpected preference observed";
     return;
   }
 
@@ skipping 48 matching lines @@
   // Migrate obsolete cookie prompt mode.
   if (ValueToContentSetting(
           default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].get()) ==
               CONTENT_SETTING_ASK) {
     default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].reset(
         new base::FundamentalValue(CONTENT_SETTING_BLOCK));
   }
 }
 
 }  // namespace content_settings