Swap ownership of RulesetService and the content delegate

chrome/browser/component_updater/subresource_filter_component_installer.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/component_updater/subresource_filter_component_installer.h"
 
 #include <utility>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
 #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"
 
 using component_updater::ComponentUpdateService;
 
 namespace component_updater {
 
 // The extension id is: gcmjkmgdlgnkkcocmoeiminaijmmjnii
 const uint8_t kPublicKeySHA256[32] = {
@@ skipping 47 matching lines @@
       ruleset_format != kCurrentRulesetFormat) {
     DVLOG(1) << "Bailing out. Future ruleset version: " << ruleset_format;
     return;
   }
   subresource_filter::UnindexedRulesetInfo ruleset_info;
   ruleset_info.content_version = version.GetString();
   ruleset_info.ruleset_path =
       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().
 bool SubresourceFilterComponentInstallerTraits::VerifyInstallation(
     const base::DictionaryValue& manifest,
     const base::FilePath& install_dir) const {
   return base::PathExists(install_dir);
 }
 
 base::FilePath
@@ skipping 48 matching lines @@
     return;
   std::unique_ptr<ComponentInstallerTraits> traits(
       new SubresourceFilterComponentInstallerTraits());
   // |cus| will take ownership of |installer| during installer->Register(cus).
   DefaultComponentInstaller* installer =
       new DefaultComponentInstaller(std::move(traits));
   installer->Register(cus, base::Closure());
 }
 
 }  // namespace component_updater