Change RulesRegistryService to use ProfileKeyedAPI.

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 2127e00c63beabb69c888da17c575b6761df49f6..e36667ba18c3fc8041cc7a321772c9c341d840f2 100644
--- a/chrome/browser/extensions/extension_system.cc
+++ b/chrome/browser/extensions/extension_system.cc
@@ -13,7 +13,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/extensions/api/alarms/alarm_manager.h"
-#include "chrome/browser/extensions/api/declarative/rules_registry_service.h"
 #include "chrome/browser/extensions/api/location/location_manager.h"
 #include "chrome/browser/extensions/api/messaging/message_service.h"
 #include "chrome/browser/extensions/blacklist.h"
@@ -321,8 +320,6 @@ ExtensionSystemImpl::ExtensionSystemImpl(Profile* profile)
 }
 
 ExtensionSystemImpl::~ExtensionSystemImpl() {
-  if (rules_registry_service_)
-    rules_registry_service_->Shutdown();
 }
 
 void ExtensionSystemImpl::Shutdown() {
@@ -352,23 +349,9 @@ void ExtensionSystemImpl::InitForRegularProfile(bool extensions_enabled) {
   usb_device_resource_manager_.reset(
       new ApiResourceManager<UsbDeviceResource>(BrowserThread::IO));
 
-  rules_registry_service_.reset(new RulesRegistryService(profile_));
-  rules_registry_service_->RegisterDefaultRulesRegistries();
-
   shared_->Init(extensions_enabled);
 }
 
-void ExtensionSystemImpl::InitForOTRProfile() {
-  // Only initialize the RulesRegistryService of the OTR ExtensionSystem if the
-  // regular ExtensionSystem has been initialized properly, as we depend on it.
-  // Some ChromeOS browser tests don't initialize the regular ExtensionSystem
-  // in login-tests.
-  if (extension_service()) {

[Yoyo Zhou, 2013/04/26 03:49:02]

extension_service() asks for the regular profile's ExtensionSystem's
ExtensionService. If you can't find where RulesRegistryService needs this to be
initialized, I can't find the reason for it in the original CL that added this
code, so you may be able to remove the constraint. (Fingers crossed.)

-    rules_registry_service_.reset(new RulesRegistryService(profile_));
-    rules_registry_service_->RegisterDefaultRulesRegistries();
-  }
-}
-
 ExtensionService* ExtensionSystemImpl::extension_service() {
   return shared_->extension_service();
 }
@@ -425,10 +408,6 @@ EventRouter* ExtensionSystemImpl::event_router() {
   return shared_->event_router();
 }
 
-RulesRegistryService* ExtensionSystemImpl::rules_registry_service() {
-  return rules_registry_service_.get();
-}
-
 ApiResourceManager<SerialConnection>*
 ExtensionSystemImpl::serial_connection_manager() {
   return serial_connection_manager_.get();