| commit | 49f19b63fd8b172ef07213efe9ec510f5a9732f5 | [log] [tgz] |
|---|---|---|
| author | Eric Robinson <[email protected]> | Mon Sep 17 21:28:15 2018 |
| committer | Commit Bot <[email protected]> | Mon Sep 17 21:28:15 2018 |
| tree | 61bab12f4851808bf1a7a892c992c04adb4e2f32 | |
| parent | e22875deadcd34d91ebc9b2bb8a510f3826a08cb [diff] [blame] |
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/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index b01628f..255d6e4 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc
@@ -107,8 +107,7 @@ #include "components/rappor/rappor_service_impl.h" #include "components/sessions/core/session_id_generator.h" #include "components/signin/core/browser/profile_management_switches.h" -#include "components/subresource_filter/content/browser/content_ruleset_service.h" -#include "components/subresource_filter/core/browser/ruleset_service.h" +#include "components/subresource_filter/content/browser/ruleset_service.h" #include "components/subresource_filter/core/browser/subresource_filter_constants.h" #include "components/subresource_filter/core/browser/subresource_filter_features.h" #include "components/translate/core/browser/translate_download_manager.h"