Componentize HostContentSettingsMap and content settings providers.
These files are mutually dependent via includes (default provider
includes content_settings_util.h but content_settings_util.cc
includes host_content_settings_map.h, for example).
BUG=384869, 384876
[email protected], [email protected]
[email protected], [email protected]
TEST=no functional changes, build succeeds
Review URL: https://codereview.chromium.org/670953006
Cr-Commit-Position: refs/heads/master@{#301286}
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 2d0b391..8223ed1 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -20,7 +20,6 @@
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/content_settings/content_settings_custom_extension_provider.h"
#include "chrome/browser/content_settings/content_settings_internal_extension_provider.h"
-#include "chrome/browser/content_settings/host_content_settings_map.h"
#include "chrome/browser/extensions/api/content_settings/content_settings_service.h"
#include "chrome/browser/extensions/component_loader.h"
#include "chrome/browser/extensions/crx_installer.h"
@@ -53,6 +52,7 @@
#include "chrome/common/extensions/extension_constants.h"
#include "chrome/common/extensions/features/feature_channel.h"
#include "chrome/common/url_constants.h"
+#include "components/content_settings/core/browser/host_content_settings_map.h"
#include "components/crx_file/id_util.h"
#include "components/startup_metric_utils/startup_metric_utils.h"
#include "content/public/browser/devtools_agent_host.h"