chrome/browser/component_updater/subresource_filter_component_installer.cc - Issue 2731283009: Swap ownership of RulesetService and the content delegate

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/component_updater/subresource_filter_component_installer.cc

Issue 2731283009: Swap ownership of RulesetService and the content delegate (Closed)

Patch Set: engedy review Created 3 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/browser_process_impl.cc ('k') | chrome/browser/component_updater/subresource_filter_component_installer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/component_updater/subresource_filter_component_installer.cc

diff --git a/chrome/browser/component_updater/subresource_filter_component_installer.cc b/chrome/browser/component_updater/subresource_filter_component_installer.cc

index ad4a4501504a6fc73bd3f56fc23ec37a25176cfe..a636e3faec3a6c052334838c19095b9f114e5d55 100644

--- a/chrome/browser/component_updater/subresource_filter_component_installer.cc

+++ b/chrome/browser/component_updater/subresource_filter_component_installer.cc

@@ -12,6 +12,7 @@

#include "base/version.h"

#include "chrome/browser/browser_process.h"

#include "components/component_updater/component_updater_paths.h"

+#include "components/subresource_filter/content/browser/content_ruleset_service.h"

#include "components/subresource_filter/core/browser/ruleset_service.h"

#include "components/subresource_filter/core/browser/subresource_filter_constants.h"

#include "components/subresource_filter/core/browser/subresource_filter_features.h"

@@ -79,10 +80,12 @@ void SubresourceFilterComponentInstallerTraits::ComponentReady(

install_dir.Append(subresource_filter::kUnindexedRulesetDataFileName);

ruleset_info.license_path =

install_dir.Append(subresource_filter::kUnindexedRulesetLicenseFileName);

- subresource_filter::RulesetService* ruleset_service =

+ subresource_filter::ContentRulesetService* content_ruleset_service =

g_browser_process->subresource_filter_ruleset_service();

- if (ruleset_service)

- ruleset_service->IndexAndStoreAndPublishRulesetIfNeeded(ruleset_info);

+ if (content_ruleset_service) {

+ content_ruleset_service->IndexAndStoreAndPublishRulesetIfNeeded(

+ ruleset_info);

+ }

}

// Called during startup and installation before ComponentReady().