Decouple RulesCacheDelegate from RulesRegistry

chrome/browser/extensions/api/declarative/rules_registry_service.cc

Index: chrome/browser/extensions/api/declarative/rules_registry_service.cc
diff --git a/chrome/browser/extensions/api/declarative/rules_registry_service.cc b/chrome/browser/extensions/api/declarative/rules_registry_service.cc
index fd2a4abceb1f8a4d70038a531d74a3c90f5be585..6103bbcfad8bfae6e496c2609846f6ae6cc9f07e 100644
--- a/chrome/browser/extensions/api/declarative/rules_registry_service.cc
+++ b/chrome/browser/extensions/api/declarative/rules_registry_service.cc
@@ -45,10 +45,15 @@ RulesRegistryService::RulesRegistryService(Profile* profile)
 RulesRegistryService::~RulesRegistryService() {}
 
 void RulesRegistryService::RegisterDefaultRulesRegistries() {
-  scoped_ptr<RulesCacheDelegate> ui_part;
   scoped_refptr<WebRequestRulesRegistry> web_request_rules_registry(
-      new WebRequestRulesRegistry(profile_, &ui_part));
-  ui_parts_of_registries_.push_back(ui_part.release());
+      new WebRequestRulesRegistry(profile_));
+
+  scoped_ptr<RulesCacheDelegate> web_request_cache_delegate(
+      new RulesCacheDelegate(web_request_rules_registry->GetWeakPtr(),
+      true /*log_storage_init_delay*/));
+  web_request_rules_registry->SetCacheDelegate(
+      web_request_cache_delegate->GetWeakPtr());
+  cache_delegates_.push_back(web_request_cache_delegate.release());
 
   RegisterRulesRegistry(web_request_rules_registry);
   content::BrowserThread::PostTask(
@@ -58,8 +63,14 @@ void RulesRegistryService::RegisterDefaultRulesRegistries() {
 
 #if defined(ENABLE_EXTENSIONS)
   scoped_refptr<ContentRulesRegistry> content_rules_registry(
-      new ContentRulesRegistry(profile_, &ui_part));
-  ui_parts_of_registries_.push_back(ui_part.release());
+      new ContentRulesRegistry(profile_));
+
+  scoped_ptr<RulesCacheDelegate> content_rules_cache_delegate(
+      new RulesCacheDelegate(content_rules_registry->GetWeakPtr(),
+                             false /*log_storage_init_delay*/));
+  content_rules_registry->SetCacheDelegate(
+      content_rules_cache_delegate->GetWeakPtr());
+  cache_delegates_.push_back(content_rules_cache_delegate.release());
 
   RegisterRulesRegistry(content_rules_registry);
   content_rules_registry_ = content_rules_registry.get();