Persist declarative rules to the extension state store.

chrome/browser/extensions/extension_system.cc

Index: chrome/browser/extensions/extension_system.cc
diff --git a/chrome/browser/extensions/extension_system.cc b/chrome/browser/extensions/extension_system.cc
index 5637588e36d677b526b0d343519fface234f3f91..d39336d2d6be15e94e721b0ee9b351e14ccbc805 100644
--- a/chrome/browser/extensions/extension_system.cc
+++ b/chrome/browser/extensions/extension_system.cc
@@ -131,10 +131,16 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
       autoupdate_enabled,
       extensions_enabled));
 
-  // The ManagementPolicy providers msut be registered before the
-  // ExtensionService tries to load any extensions.
-  management_policy_.reset(new extensions::ManagementPolicy);
-  RegisterManagementPolicyProviders();
+  // These services must be registered before the ExtensionService tries to
+  // load any extensions.
+  {
+    rules_registry_service_.reset(
+        new extensions::RulesRegistryService(profile_));
+    rules_registry_service_->RegisterDefaultRulesRegistries();
+
+    management_policy_.reset(new extensions::ManagementPolicy);
+    RegisterManagementPolicyProviders();
+  }
 
   extension_service_->component_loader()->AddDefaultComponentExtensions();
   if (command_line->HasSwitch(switches::kLoadComponentExtension)) {
@@ -196,9 +202,6 @@ void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
       extension_service_->InitEventRouters();
     }
   }
-
-  rules_registry_service_.reset(new extensions::RulesRegistryService(profile_));
-  rules_registry_service_->RegisterDefaultRulesRegistries();
 }
 
 extensions::StateStore* ExtensionSystemImpl::Shared::state_store() {