Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(178)

Unified Diff: components/subresource_filter/core/browser/ruleset_service.h

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
Index: components/subresource_filter/core/browser/ruleset_service.h
diff --git a/components/subresource_filter/core/browser/ruleset_service.h b/components/subresource_filter/core/browser/ruleset_service.h
index d460f14fde38d76aa574f2de76a64da164eaf3bf..ef84c0ca6e6bc9cc298e121488eaa5e76b42fd79 100644
--- a/components/subresource_filter/core/browser/ruleset_service.h
+++ b/components/subresource_filter/core/browser/ruleset_service.h
@@ -170,7 +170,7 @@ class RulesetService : public base::SupportsWeakPtr<RulesetService> {
// See class comments for details of arguments.
RulesetService(PrefService* local_state,
scoped_refptr<base::SequencedTaskRunner> blocking_task_runner,
- std::unique_ptr<RulesetServiceDelegate> delegate,
+ RulesetServiceDelegate* delegate,
const base::FilePath& indexed_ruleset_base_dir);
virtual ~RulesetService();
@@ -187,9 +187,6 @@ class RulesetService : public base::SupportsWeakPtr<RulesetService> {
virtual void IndexAndStoreAndPublishRulesetIfNeeded(
const UnindexedRulesetInfo& unindexed_ruleset_info);
- // Exposed for browser tests.
- RulesetServiceDelegate* delegate() { return delegate_.get(); }
-
private:
friend class SubresourceFilteringRulesetServiceTest;
FRIEND_TEST_ALL_PREFIXES(SubresourceFilteringRulesetServiceTest,
@@ -252,7 +249,9 @@ class RulesetService : public base::SupportsWeakPtr<RulesetService> {
PrefService* const local_state_;
scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
- std::unique_ptr<RulesetServiceDelegate> delegate_;
+
+ // Must outlive |this| object.
+ RulesetServiceDelegate* delegate_;
UnindexedRulesetInfo queued_unindexed_ruleset_info_;
bool is_after_startup_;

Powered by Google App Engine
This is Rietveld 408576698