| Index: trunk/src/chrome/browser/extensions/api/declarative/rules_registry_service.cc
|
| ===================================================================
|
| --- trunk/src/chrome/browser/extensions/api/declarative/rules_registry_service.cc (revision 202762)
|
| +++ trunk/src/chrome/browser/extensions/api/declarative/rules_registry_service.cc (working copy)
|
| @@ -5,7 +5,6 @@
|
| #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"
|
| #include "chrome/browser/extensions/api/declarative/initializing_rules_registry.h"
|
| @@ -36,8 +35,7 @@
|
| : profile_(profile) {
|
| if (profile) {
|
| registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
|
| - content::Source<Profile>(profile->GetOriginalProfile()));
|
| - RegisterDefaultRulesRegistries();
|
| + content::Source<Profile>(profile->GetOriginalProfile()));
|
| }
|
| }
|
|
|
| @@ -72,20 +70,6 @@
|
| profile_, scoped_refptr<WebRequestRulesRegistry>(NULL)));
|
| }
|
|
|
| -static base::LazyInstance<ProfileKeyedAPIFactory<RulesRegistryService> >
|
| -g_factory = LAZY_INSTANCE_INITIALIZER;
|
| -
|
| -// static
|
| -ProfileKeyedAPIFactory<RulesRegistryService>*
|
| -RulesRegistryService::GetFactoryInstance() {
|
| - return &g_factory.Get();
|
| -}
|
| -
|
| -// static
|
| -RulesRegistryService* RulesRegistryService::Get(Profile* profile) {
|
| - return ProfileKeyedAPIFactory<RulesRegistryService>::GetForProfile(profile);
|
| -}
|
| -
|
| void RulesRegistryService::RegisterRulesRegistry(
|
| scoped_refptr<RulesRegistry> rule_registry) {
|
| const std::string event_name(rule_registry->event_name());
|
|
|