Unrevert r141537: Add extensions::StateStore and use that instead of

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_
 #pragma once
 
 #include <string>
 
@@ skipping 12 matching lines @@
 class ExtensionService;
 class Profile;
 class UserScriptMaster;
 
 namespace extensions {
 class AlarmManager;
 class Extension;
 class LazyBackgroundTaskQueue;
 class ManagementPolicy;
 class RulesRegistryService;
+class StateStore;
 }
 
 // The ExtensionSystem manages the creation and destruction of services
 // related to extensions. Most objects are shared between normal
 // and incognito Profiles, except as called out in comments.
 // This interface supports using TestExtensionSystem for TestingProfiles
 // that don't want all of the extensions baggage in their tests.
 class ExtensionSystem : public ProfileKeyedService {
  public:
   ExtensionSystem();
@@ skipping 24 matching lines @@
 
   // The UserScriptMaster is created at startup.
   virtual UserScriptMaster* user_script_master() = 0;
 
   // The ExtensionProcessManager is created at startup.
   virtual ExtensionProcessManager* process_manager() = 0;
 
   // The AlarmManager is created at startup.
   virtual extensions::AlarmManager* alarm_manager() = 0;
 
+  // The StateStore is created at startup.
+  virtual extensions::StateStore* state_store() = 0;
+
   // Returns the IO-thread-accessible extension data.
   virtual ExtensionInfoMap* info_map() = 0;
 
   // The LazyBackgroundTaskQueue is created at startup.
   virtual extensions::LazyBackgroundTaskQueue* lazy_background_task_queue() = 0;
 
   // The ExtensionMessageService is created at startup.
   virtual ExtensionMessageService* message_service() = 0;
 
   // The ExtensionEventRouter is created at startup.
@@ skipping 32 matching lines @@
   virtual void Shutdown() OVERRIDE;
 
   virtual void Init(bool extensions_enabled) OVERRIDE;
 
   virtual ExtensionService* extension_service() OVERRIDE;  // shared
   virtual extensions::ManagementPolicy* management_policy() OVERRIDE;  // shared
   virtual UserScriptMaster* user_script_master() OVERRIDE;  // shared
   virtual ExtensionDevToolsManager* devtools_manager() OVERRIDE;
   virtual ExtensionProcessManager* process_manager() OVERRIDE;
   virtual extensions::AlarmManager* alarm_manager() OVERRIDE;
+  virtual extensions::StateStore* state_store() OVERRIDE;
   virtual extensions::LazyBackgroundTaskQueue* lazy_background_task_queue()
       OVERRIDE;  // shared
   virtual ExtensionInfoMap* info_map() OVERRIDE;  // shared
   virtual ExtensionMessageService* message_service() OVERRIDE;  // shared
   virtual ExtensionEventRouter* event_router() OVERRIDE;  // shared
   // The RulesRegistryService is created at startup.
   virtual extensions::RulesRegistryService* rules_registry_service()
       OVERRIDE;  // shared
 
   virtual void RegisterExtensionWithRequestContexts(
@@ skipping 13 matching lines @@
     explicit Shared(Profile* profile);
     virtual ~Shared();
 
     // Initialization takes place in phases.
     virtual void InitPrefs();
     // This must not be called until all the providers have been created.
     void RegisterManagementPolicyProviders();
     void InitInfoMap();
     void Init(bool extensions_enabled);
 
+    extensions::StateStore* state_store();
     ExtensionService* extension_service();
     extensions::ManagementPolicy* management_policy();
     UserScriptMaster* user_script_master();
     ExtensionInfoMap* info_map();
     extensions::LazyBackgroundTaskQueue* lazy_background_task_queue();
     ExtensionMessageService* message_service();
     ExtensionEventRouter* event_router();
     extensions::RulesRegistryService* rules_registry_service();
 
    private:
     Profile* profile_;
 
     // The services that are shared between normal and incognito profiles.
 
-    // Keep extension_prefs_ above extension_service_, because the latter
-    // maintains a pointer to the former and must be destructed first.
+    scoped_ptr<extensions::StateStore> state_store_;
     scoped_ptr<ExtensionPrefs> extension_prefs_;
+    // ExtensionService depends on the 2 above.
     scoped_ptr<ExtensionService> extension_service_;
     scoped_ptr<extensions::ManagementPolicy> management_policy_;
     scoped_refptr<UserScriptMaster> user_script_master_;
     // extension_info_map_ needs to outlive extension_process_manager_.
     scoped_refptr<ExtensionInfoMap> extension_info_map_;
     // This is a dependency of ExtensionMessageService and ExtensionEventRouter.
     scoped_ptr<extensions::LazyBackgroundTaskQueue> lazy_background_task_queue_;
     scoped_ptr<ExtensionMessageService> extension_message_service_;
     scoped_ptr<ExtensionEventRouter> extension_event_router_;
     scoped_ptr<ExtensionNavigationObserver> extension_navigation_observer_;
@@ skipping 10 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<extensions::AlarmManager> alarm_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionSystemImpl);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_SYSTEM_H_