diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-29 11:39:13 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-29 11:39:13 +0000 |
| commit | 0c4d90a4f8793a6e3df79905bce5a95b00632085 (patch) | |
| tree | 1026342bb4bd3291bfd7244474f14ca472ebabd2 | |
| parent | 7e13030b1cd2f7d2a81e1d59f8549c2c8318ec88 (diff) | |
| download | chromium_src-0c4d90a4f8793a6e3df79905bce5a95b00632085.zip chromium_src-0c4d90a4f8793a6e3df79905bce5a95b00632085.tar.gz chromium_src-0c4d90a4f8793a6e3df79905bce5a95b00632085.tar.bz2 | |
Free prefservice from signed settings temp storage unittests
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/4151011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64410 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/login/signed_settings_temp_storage_unittest.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/chrome/browser/chromeos/login/signed_settings_temp_storage_unittest.cc b/chrome/browser/chromeos/login/signed_settings_temp_storage_unittest.cc index 1c18582..e92917b 100644 --- a/chrome/browser/chromeos/login/signed_settings_temp_storage_unittest.cc +++ b/chrome/browser/chromeos/login/signed_settings_temp_storage_unittest.cc @@ -10,6 +10,7 @@ #include <vector> #include "base/file_util.h" +#include "base/scoped_ptr.h" #include "base/scoped_temp_dir.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/prefs/pref_service.h" @@ -30,14 +31,14 @@ class SignedSettingsTempStorageTest : public ::testing::Test { FilePath temp_file; ASSERT_TRUE( file_util::CreateTemporaryFileInDir(temp_dir_.path(), &temp_file)); - local_state_ = PrefService::CreatePrefService(temp_file, NULL); - ASSERT_TRUE(NULL != local_state_); - SignedSettingsTempStorage::RegisterPrefs(local_state_); + local_state_.reset(PrefService::CreatePrefService(temp_file, NULL)); + ASSERT_TRUE(NULL != local_state_.get()); + SignedSettingsTempStorage::RegisterPrefs(local_state_.get()); } std::map<std::string, std::string> ref_map_; ScopedTempDir temp_dir_; - PrefService* local_state_; + scoped_ptr<PrefService> local_state_; }; TEST_F(SignedSettingsTempStorageTest, Basic) { @@ -56,7 +57,7 @@ TEST_F(SignedSettingsTempStorageTest, Basic) { for (size_t i = 0; i < a_list.size(); ++i) { EXPECT_TRUE(SignedSettingsTempStorage::Store(a_list[i]->first, a_list[i]->second, - local_state_)); + local_state_.get())); } for (int i = 0; i < 3; ++i) { std::copy(a_list.begin(), a_list.end(), std::back_inserter(b_list)); @@ -65,11 +66,11 @@ TEST_F(SignedSettingsTempStorageTest, Basic) { std::string value; for (size_t i = 0; i < b_list.size(); ++i) { EXPECT_TRUE(SignedSettingsTempStorage::Retrieve(b_list[i]->first, &value, - local_state_)); + local_state_.get())); EXPECT_EQ(b_list[i]->second, value); EXPECT_FALSE(SignedSettingsTempStorage::Retrieve("non-existent tv-series", &value, - local_state_)); + local_state_.get())); } } |