Change RulesRegistryService to use ProfileKeyedAPI.

chrome/browser/extensions/extension_system.h

Index: chrome/browser/extensions/extension_system.h
diff --git a/chrome/browser/extensions/extension_system.h b/chrome/browser/extensions/extension_system.h
index d5d38c89e0e50f6be5245d952f5b00058d485afb..3e510c39d7c2fb3237b4f91e70ce581bf476518b 100644
--- a/chrome/browser/extensions/extension_system.h
+++ b/chrome/browser/extensions/extension_system.h
@@ -66,8 +66,6 @@ class ExtensionSystem : public ProfileKeyedService {
   // are controlled by |extensions_enabled|.
   virtual void InitForRegularProfile(bool extensions_enabled) = 0;
 
-  virtual void InitForOTRProfile() = 0;
-
   // The ExtensionService is created at startup.
   virtual ExtensionService* extension_service() = 0;
 
@@ -112,9 +110,6 @@ class ExtensionSystem : public ProfileKeyedService {
   // The EventRouter is created at startup.
   virtual EventRouter* event_router() = 0;
 
-  // The RulesRegistryService is created at startup.
-  virtual RulesRegistryService* rules_registry_service() = 0;
-
   // The SerialConnection ResourceManager is created at startup.
   virtual ApiResourceManager<SerialConnection>*
   serial_connection_manager() = 0;
@@ -163,7 +158,6 @@ class ExtensionSystemImpl : public ExtensionSystem {
   virtual void Shutdown() OVERRIDE;
 
   virtual void InitForRegularProfile(bool extensions_enabled) OVERRIDE;
-  virtual void InitForOTRProfile() OVERRIDE;
 
   virtual ExtensionService* extension_service() OVERRIDE;  // shared
   virtual ManagementPolicy* management_policy() OVERRIDE;  // shared
@@ -181,8 +175,6 @@ class ExtensionSystemImpl : public ExtensionSystem {
   virtual ExtensionInfoMap* info_map() OVERRIDE;  // shared
   virtual MessageService* message_service() OVERRIDE;  // shared
   virtual EventRouter* event_router() OVERRIDE;  // shared
-  virtual RulesRegistryService* rules_registry_service()
-      OVERRIDE;  // shared

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

This comment was out of date. It wasn't shared. There should be a separate
instance for the incognito profile (so it should have
ServiceHasOwnInstanceInIncognito; we don't have a switch for that yet in
ProfileKeyedAPI, but go ahead and add one).

[Patrick Riordan, 2013/05/01 01:30:34]

Done.

   virtual ApiResourceManager<SerialConnection>* serial_connection_manager()
       OVERRIDE;
   virtual ApiResourceManager<Socket>* socket_manager() OVERRIDE;
@@ -279,7 +271,6 @@ class ExtensionSystemImpl : public ExtensionSystem {
   scoped_ptr<ApiResourceManager<Socket> > socket_manager_;
   scoped_ptr<ApiResourceManager<
                UsbDeviceResource> > usb_device_resource_manager_;
-  scoped_ptr<RulesRegistryService> rules_registry_service_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionSystemImpl);
 };