Merge of ruleset_service and content_ruleset_service files.
This is the first step in the changes described here:
https://docs.google.com/document/d/1-YrMraWuCno5b5j5128YqIq6RnAddOMzUxnq6mKIuL4
It removes the files associated with
components/subresource_filter/core/browser/ruleset_service* and combines
them with components/subresource_filter/content/browser/content_ruleset_service*.
These are all under the name ruleset_service now, and future changes will
merge these two classes into one.
TBRing reviewers:
[email protected]: Please review first 6 files in the CL, which are
changes to the include lists to reflect the merging of these files.
[email protected]
Change-Id: Icec932b5ac1fee6ca4e1647403a630c05adf5159
Reviewed-on: https://chromium-review.googlesource.com/1228234
Commit-Queue: Eric Robinson <[email protected]>
Reviewed-by: Charlie Harrison <[email protected]>
Cr-Commit-Position: refs/heads/master@{#591824}diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 4a520805..5fddf00b 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -113,7 +113,7 @@
#include "components/search_engines/template_url_prepopulate_data.h"
#include "components/sessions/core/session_id_generator.h"
#include "components/startup_metric_utils/browser/startup_metric_utils.h"
-#include "components/subresource_filter/core/browser/ruleset_service.h"
+#include "components/subresource_filter/content/browser/ruleset_service.h"
#include "components/sync/base/sync_prefs.h"
#include "components/sync_preferences/pref_service_syncable.h"
#include "components/translate/core/browser/translate_prefs.h"
