Remove content dependencies from content settings providers.

BUG=384876
R=bauerb@chromium.org, markusheintz@chromium.org, vabr@chromium.org, rlp@chromium.org
TEST=no functional changes

Review URL: https://codereview.chromium.org/596613002

Cr-Commit-Position: refs/heads/master@{#297288}

chrome/browser/content_settings/content_settings_default_provider.cc

@@ -9,11 +9,11 @@
 
 #include "base/auto_reset.h"
 #include "base/basictypes.h"
+#include "base/bind.h"
 #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"
@@ -21,12 +21,8 @@
 #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 {

chrome/browser/content_settings/content_settings_internal_extension_provider.h

@@ -23,7 +23,7 @@ namespace content_settings {
 
 // A content settings provider which disables certain plugins for platform apps.
 class InternalExtensionProvider : public ObservableProvider,
-                            public content::NotificationObserver {
+                                  public content::NotificationObserver {
  public:
   explicit InternalExtensionProvider(ExtensionService* extension_service);
 

chrome/browser/content_settings/content_settings_pref_provider.cc

@@ -26,10 +26,8 @@
 #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/user_metrics.h"
 #include "url/gurl.h"
 
-using base::UserMetricsAction;
 using content::BrowserThread;
 
 namespace {

chrome/browser/content_settings/host_content_settings_map.cc

@@ -27,7 +27,6 @@
 #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"