Fix a memory leak in RulesRegistryStorageDelegate.

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/logging.h"
 #include "chrome/browser/extensions/api/declarative/initializing_rules_registry.h"
 #include "chrome/browser/extensions/api/declarative/rules_registry_storage_delegate.h"
@@ skipping 25 matching lines @@
 }  // namespace
 
 RulesRegistryService::RulesRegistryService(Profile* profile)
     : profile_(profile) {
   if (profile) {
     registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
                    content::Source<Profile>(profile));
   }
 }
 
-RulesRegistryService::~RulesRegistryService() {}
+RulesRegistryService::~RulesRegistryService() {
+  for (size_t i = 0; i < delegates_.size(); ++i)
+    delegates_[i]->CleanupOnUIThread();
+}
 
 void RulesRegistryService::RegisterDefaultRulesRegistries() {
   RulesRegistryStorageDelegate* delegate = new RulesRegistryStorageDelegate();
   scoped_refptr<WebRequestRulesRegistry> web_request_rules_registry(
       new WebRequestRulesRegistry(profile_, delegate));
-  delegate->Init(profile_, web_request_rules_registry,
+  delegate->InitOnUIThread(profile_, web_request_rules_registry,
       GetDeclarativeRuleStorageKey(
           declarative_webrequest_constants::kOnRequest));
+  delegates_.push_back(delegate);
 
   RegisterRulesRegistry(declarative_webrequest_constants::kOnRequest,
                         web_request_rules_registry);
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE,
       base::Bind(&RegisterToExtensionWebRequestEventRouterOnIO,
           web_request_rules_registry));
 }
 
 void RulesRegistryService::Shutdown() {
@@ skipping 51 matching lines @@
       OnExtensionUnloaded(extension->id());
       break;
     }
     default:
       NOTREACHED();
       break;
   }
 }
 
 }  // namespace extensions