Change RulesRegistryService to use ProfileKeyedAPI.

chrome/browser/extensions/extension_system.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_SYSTEM_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SYSTEM_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
@@ skipping 48 matching lines @@
   static ExtensionSystem* Get(Profile* profile);
 
   // ProfileKeyedService implementation.
   virtual void Shutdown() OVERRIDE {}
 
   // Initializes extensions machinery.
   // Component extensions are always enabled, external and user extensions
   // 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;
 
   // The class controlling whether users are permitted to perform certain
   // actions on extensions (install, uninstall, disable, etc.).
   // The ManagementPolicy is created at startup.
   virtual ManagementPolicy* management_policy() = 0;
 
   // The UserScriptMaster is created at startup.
   virtual UserScriptMaster* user_script_master() = 0;
@@ skipping 24 matching lines @@
 
   // The LazyBackgroundTaskQueue is created at startup.
   virtual LazyBackgroundTaskQueue* lazy_background_task_queue() = 0;
 
   // The MessageService is created at startup.
   virtual MessageService* message_service() = 0;
 
   // 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;
 
   // The Socket ResourceManager is created at startup.
   virtual ApiResourceManager<Socket>*
   socket_manager() = 0;
 
   // The UsbDeviceResource ResourceManager is created at startup.
   virtual ApiResourceManager<UsbDeviceResource>*
@@ skipping 28 matching lines @@
 // but with a shared instance for incognito) keeps the common services.
 class ExtensionSystemImpl : public ExtensionSystem {
  public:
   explicit ExtensionSystemImpl(Profile* profile);
   virtual ~ExtensionSystemImpl();
 
   // ProfileKeyedService implementation.
   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
   virtual UserScriptMaster* user_script_master() OVERRIDE;  // shared
   virtual ExtensionProcessManager* process_manager() OVERRIDE;
   virtual AlarmManager* alarm_manager() OVERRIDE;
   virtual LocationManager* location_manager() OVERRIDE;
   virtual StateStore* state_store() OVERRIDE;  // shared
   virtual StateStore* rules_store() OVERRIDE;  // shared
   virtual ExtensionPrefs* extension_prefs() OVERRIDE;  // shared
   virtual ShellWindowGeometryCache* shell_window_geometry_cache()
       OVERRIDE;  // shared
   virtual LazyBackgroundTaskQueue* lazy_background_task_queue()
       OVERRIDE;  // shared
   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;
   virtual ApiResourceManager<UsbDeviceResource>* usb_device_resource_manager()
       OVERRIDE;
   virtual ExtensionWarningService* warning_service() OVERRIDE;
   virtual Blacklist* blacklist() OVERRIDE;  // shared
 
   virtual void RegisterExtensionWithRequestContexts(
       const Extension* extension) OVERRIDE;
@@ skipping 76 matching lines @@
   // |io_data_|. While |extension_process_manager_| still lives, we handle
   // incoming resource requests from extension processes and those require
   // access to the ResourceContext owned by |io_data_|.
   scoped_ptr<ExtensionProcessManager> extension_process_manager_;
   scoped_ptr<AlarmManager> alarm_manager_;
   scoped_refptr<LocationManager> location_manager_;
   scoped_ptr<ApiResourceManager<SerialConnection> > serial_connection_manager_;
   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);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_SYSTEM_H_