Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2758)

Unified Diff: chrome/browser/sync/syncable/directory_backing_store_unittest.cc

Issue 3026029: Fix EntryKernel leak if sync database load fails (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Fix legit leak in PurgeEntriesWithTypeIn Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/syncable/directory_backing_store_unittest.cc
diff --git a/chrome/browser/sync/syncable/directory_backing_store_unittest.cc b/chrome/browser/sync/syncable/directory_backing_store_unittest.cc
index b1f5dc988e51367ce2183f50956f0e746f40f2d2..365612c0b5a489cd24dcc63d37e7de3acd589751 100644
--- a/chrome/browser/sync/syncable/directory_backing_store_unittest.cc
+++ b/chrome/browser/sync/syncable/directory_backing_store_unittest.cc
@@ -879,6 +879,7 @@ TEST_P(MigrationTest, ToCurrentVersion) {
}
MetahandlesIndex index;
+ STLElementDeleter<MetahandlesIndex> index_deleter(&index);
dbs->LoadEntries(&index);
dbs->EndLoad();
@@ -1004,8 +1005,6 @@ TEST_P(MigrationTest, ToCurrentVersion) {
ASSERT_EQ(14, (*it)->ref(META_HANDLE));
ASSERT_TRUE(++it == index.end());
-
- STLDeleteElements(&index);
}
INSTANTIATE_TEST_CASE_P(DirectoryBackingStore, MigrationTest,
@@ -1048,8 +1047,8 @@ TEST_F(DirectoryBackingStoreTest, DeleteEntries) {
scoped_ptr<DirectoryBackingStore> dbs(
new DirectoryBackingStore(GetUsername(), GetDatabasePath()));
dbs->BeginLoad();
-
MetahandlesIndex index;
+ STLElementDeleter<MetahandlesIndex> index_deleter(&index);
dbs->LoadEntries(&index);
size_t initial_size = index.size();
ASSERT_LT(0U, initial_size) << "Test requires entries to delete.";
@@ -1058,7 +1057,7 @@ TEST_F(DirectoryBackingStoreTest, DeleteEntries) {
to_delete.insert(first_to_die);
EXPECT_TRUE(dbs->DeleteEntries(to_delete));
- index.clear();
+ STLDeleteElements(&index);
dbs->LoadEntries(&index);
EXPECT_EQ(initial_size - 1, index.size());
@@ -1080,7 +1079,7 @@ TEST_F(DirectoryBackingStoreTest, DeleteEntries) {
EXPECT_TRUE(dbs->DeleteEntries(to_delete));
- index.clear();
+ STLDeleteElements(&index);
dbs->LoadEntries(&index);
EXPECT_EQ(0U, index.size());

Powered by Google App Engine
This is Rietveld 408576698