diff options
| author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-13 20:25:49 +0000 |
|---|---|---|
| committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-13 20:25:49 +0000 |
| commit | bec6455ee35350a84c53d53f065fd75d67dd3884 (patch) | |
| tree | 3e9042c2ac312a4cecd9950c64691fff1822cb37 /chrome/browser/extensions/test_extension_system.cc | |
| parent | 98b2d61a945fce29dbeaaed595942cad138055aa (diff) | |
| download | chromium_src-bec6455ee35350a84c53d53f065fd75d67dd3884.zip chromium_src-bec6455ee35350a84c53d53f065fd75d67dd3884.tar.gz chromium_src-bec6455ee35350a84c53d53f065fd75d67dd3884.tar.bz2 | |
Move context menu persisting from ExtensionPrefs to extension StateStore.
BUG=123366
TEST=extension alarms are still remembered after chrome restart
Review URL: https://chromiumcodereview.appspot.com/10544124
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141957 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/test_extension_system.cc')
| -rw-r--r-- | chrome/browser/extensions/test_extension_system.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/extensions/test_extension_system.cc b/chrome/browser/extensions/test_extension_system.cc index 2773d47..493ee24 100644 --- a/chrome/browser/extensions/test_extension_system.cc +++ b/chrome/browser/extensions/test_extension_system.cc @@ -14,8 +14,10 @@ #include "chrome/browser/extensions/extension_process_manager.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" +#include "chrome/browser/extensions/state_store.h" #include "chrome/browser/extensions/user_script_master.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/value_store/testing_value_store.h" #include "chrome/common/chrome_switches.h" @@ -54,6 +56,9 @@ ExtensionService* TestExtensionSystem::CreateExtensionService( profile_->GetPrefs(), install_directory, ExtensionPrefValueMapFactory::GetForProfile(profile_))); + state_store_.reset(new extensions::StateStore( + profile_, + new TestingValueStore())); extension_prefs_->Init(extensions_disabled); extension_service_.reset(new ExtensionService(profile_, command_line, @@ -101,7 +106,7 @@ extensions::AlarmManager* TestExtensionSystem::alarm_manager() { } extensions::StateStore* TestExtensionSystem::state_store() { - return NULL; + return state_store_.get(); } ExtensionInfoMap* TestExtensionSystem::info_map() { |