Fix EntryKernel leak if sync database load fails

chrome/browser/sync/syncable/directory_backing_store_unittest.cc

 // Copyright (c) 2010 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.
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include <string>
 
 #include "app/sql/connection.h"
 #include "app/sql/statement.h"
@@ skipping 861 matching lines @@
     // Renamed a column in Version 70
     ASSERT_FALSE(connection.DoesColumnExist("metas", "singleton_tag"));
     ASSERT_TRUE(connection.DoesColumnExist("metas", "unique_server_tag"));
     ASSERT_TRUE(connection.DoesColumnExist("metas", "unique_client_tag"));
 
     // Removed extended attributes in Version 72.
     ASSERT_FALSE(connection.DoesTableExist("extended_attributes"));
   }
 
   MetahandlesIndex index;
+  STLElementDeleter<MetahandlesIndex> index_deleter(&index);
   dbs->LoadEntries(&index);
   dbs->EndLoad();
 
   MetahandlesIndex::iterator it = index.begin();
   ASSERT_TRUE(it != index.end());
   ASSERT_EQ(1, (*it)->ref(META_HANDLE));
   EXPECT_TRUE((*it)->ref(ID).IsRoot());
 
   ASSERT_TRUE(++it != index.end()) << "Upgrade destroyed database contents.";
   ASSERT_EQ(2, (*it)->ref(META_HANDLE));
@@ skipping 105 matching lines @@
   EXPECT_FALSE((*it)->ref(SERVER_SPECIFICS).
       GetExtension(sync_pb::bookmark).has_favicon());
 
   ASSERT_TRUE(++it != index.end());
   ASSERT_EQ(13, (*it)->ref(META_HANDLE));
 
   ASSERT_TRUE(++it != index.end());
   ASSERT_EQ(14, (*it)->ref(META_HANDLE));
 
   ASSERT_TRUE(++it == index.end());
-
-  STLDeleteElements(&index);
 }
 
 INSTANTIATE_TEST_CASE_P(DirectoryBackingStore, MigrationTest,
                         testing::Range(67, kCurrentDBVersion));
 
 TEST_F(DirectoryBackingStoreTest, ModelTypeIds) {
   for (int i = FIRST_REAL_MODEL_TYPE; i < MODEL_TYPE_COUNT; ++i) {
     std::string model_id =
         DirectoryBackingStore::ModelTypeEnumToModelId(ModelTypeFromInt(i));
     EXPECT_EQ(i,
@@ skipping 22 matching lines @@
     EXPECT_DEATH(dbs->BeginLoad(), "sqlite error");
 #endif
   }
 }
 
 TEST_F(DirectoryBackingStoreTest, DeleteEntries) {
   SetUpCurrentDatabaseAndCheckVersion();
   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.";
   int64 first_to_die = (*index.begin())->ref(META_HANDLE);
   MetahandleSet to_delete;
   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());
   bool delete_failed = false;
   for (MetahandlesIndex::iterator it = index.begin(); it != index.end();
        ++it) {
     if ((*it)->ref(META_HANDLE) == first_to_die) {
       delete_failed = true;
       break;
     }
   }
   EXPECT_FALSE(delete_failed);
 
   to_delete.clear();
   for (MetahandlesIndex::iterator it = index.begin(); it != index.end();
        ++it) {
     to_delete.insert((*it)->ref(META_HANDLE));
   }
 
   EXPECT_TRUE(dbs->DeleteEntries(to_delete));
 
-  index.clear();
+  STLDeleteElements(&index);
   dbs->LoadEntries(&index);
   EXPECT_EQ(0U, index.size());
 
   dbs->EndLoad();
   dbs->EndSave();
 }
 
 }  // namespace syncable