diff options
| author | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-16 08:07:42 +0000 |
|---|---|---|
| committer | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-16 08:07:42 +0000 |
| commit | 836e29803eb5904c781a5ed752b615aeb51ff443 (patch) | |
| tree | 6935b9eb9c4768ee47cc3338395ced4d06b48236 /chrome/browser/extensions/test_extension_prefs.cc | |
| parent | 5f09747ae60598b164c8b4c6786619141012e769 (diff) | |
| download | chromium_src-836e29803eb5904c781a5ed752b615aeb51ff443.zip chromium_src-836e29803eb5904c781a5ed752b615aeb51ff443.tar.gz chromium_src-836e29803eb5904c781a5ed752b615aeb51ff443.tar.bz2 | |
Reland 200220 - Make ExtensionPrefs a ProfileKeyedService.
Since last time: Fixes leaks in TestExtensionSystem.
BUG=178218
TBR=asargent@chromium.org,thestig@chromium.org,rlp@chromium.org
Review URL: https://chromiumcodereview.appspot.com/15111003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200490 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/test_extension_prefs.cc')
| -rw-r--r-- | chrome/browser/extensions/test_extension_prefs.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/test_extension_prefs.cc b/chrome/browser/extensions/test_extension_prefs.cc index 7250cb6..07e4b5a 100644 --- a/chrome/browser/extensions/test_extension_prefs.cc +++ b/chrome/browser/extensions/test_extension_prefs.cc @@ -111,7 +111,7 @@ void TestExtensionPrefs::RecreateExtensionPrefs() { new ExtensionPrefStore(extension_pref_value_map_.get(), false)); pref_service_.reset(builder.CreateSyncable(pref_registry_)); - prefs_ = ExtensionPrefs::Create( + prefs_.reset(ExtensionPrefs::Create( pref_service_.get(), temp_dir_.path(), extension_pref_value_map_.get(), @@ -119,7 +119,7 @@ void TestExtensionPrefs::RecreateExtensionPrefs() { // Guarantee that no two extensions get the same installation time // stamp and we can reliably assert the installation order in the tests. scoped_ptr<ExtensionPrefs::TimeProvider>( - new IncrementalTimeProvider())); + new IncrementalTimeProvider()))); } scoped_refptr<Extension> TestExtensionPrefs::AddExtension(std::string name) { |