Decouple RulesCacheDelegate from RulesRegistry

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

 // Copyright (c) 2012 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/extensions/api/declarative/rules_registry_service.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 27 matching lines @@
   if (profile) {
     registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
         content::Source<Profile>(profile->GetOriginalProfile()));
     RegisterDefaultRulesRegistries();
   }
 }
 
 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(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(&RegisterToExtensionWebRequestEventRouterOnIO,
           profile_, web_request_rules_registry));
 
 #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();
 #endif  // defined(ENABLE_EXTENSIONS)
 }
 
 void RulesRegistryService::Shutdown() {
   // Release the references to all registries. This would happen soon during
   // destruction of |*this|, but we need the ExtensionWebRequestEventRouter to
   // be the last to reference the WebRequestRulesRegistry objects, so that
@@ skipping 69 matching lines @@
       OnExtensionUnloaded(extension->id());
       break;
     }
     default:
       NOTREACHED();
       break;
   }
 }
 
 }  // namespace extensions