Swap ownership of RulesetService and the content delegate

chrome/browser/browser_process_impl.cc

Index: chrome/browser/browser_process_impl.cc
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index be342085d4c81cde97e4375b29079b4685152651..27852e18ccc96a9de73dc0298913016a2d845d50 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -903,12 +903,12 @@ safe_browsing::ClientSideDetectionService*
   return NULL;
 }
 
-subresource_filter::RulesetService*
-BrowserProcessImpl::subresource_filter_ruleset_service() {
+subresource_filter::ContentRulesetServiceDelegate*
+BrowserProcessImpl::subresource_filter_ruleset_service_delegate() {
   DCHECK(CalledOnValidThread());
   if (!created_subresource_filter_ruleset_service_)
     CreateSubresourceFilterRulesetService();
-  return subresource_filter_ruleset_service_.get();
+  return subresource_filter_ruleset_service_delegate_.get();
 }
 
 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
@@ -1204,7 +1204,7 @@ void BrowserProcessImpl::CreateSafeBrowsingService() {
 }
 
 void BrowserProcessImpl::CreateSubresourceFilterRulesetService() {
-  DCHECK(!subresource_filter_ruleset_service_);
+  DCHECK(!subresource_filter_ruleset_service_delegate_);
   created_subresource_filter_ruleset_service_ = true;
 
   if (!base::FeatureList::IsEnabled(
@@ -1224,10 +1224,12 @@ void BrowserProcessImpl::CreateSubresourceFilterRulesetService() {
   base::FilePath indexed_ruleset_base_dir =
       user_data_dir.Append(subresource_filter::kTopLevelDirectoryName)
           .Append(subresource_filter::kIndexedRulesetBaseDirectoryName);
-  subresource_filter_ruleset_service_.reset(
-      new subresource_filter::RulesetService(
+  subresource_filter_ruleset_service_delegate_ =
+      base::MakeUnique<subresource_filter::ContentRulesetServiceDelegate>();
+  subresource_filter_ruleset_service_delegate_->set_ruleset_service(
+      base::MakeUnique<subresource_filter::RulesetService>(
           local_state(), blocking_task_runner,
-          base::MakeUnique<subresource_filter::ContentRulesetServiceDelegate>(),
+          subresource_filter_ruleset_service_delegate_.get(),
           indexed_ruleset_base_dir));
 }