Remove stl_util's STLValueDeleter.

components/sync/syncable/directory_backing_store_unittest.cc

Index: components/sync/syncable/directory_backing_store_unittest.cc
diff --git a/components/sync/syncable/directory_backing_store_unittest.cc b/components/sync/syncable/directory_backing_store_unittest.cc
index 62fddce425f5526002707ac5496e5ec8ba169744..d4f05872717d12ec460b99b6f68aa3f77bbb1ec8 100644
--- a/components/sync/syncable/directory_backing_store_unittest.cc
+++ b/components/sync/syncable/directory_backing_store_unittest.cc
@@ -15,7 +15,6 @@
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
-#include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
@@ -73,9 +72,8 @@ class MigrationTest : public testing::TestWithParam<int> {
 
   static bool LoadAndIgnoreReturnedData(DirectoryBackingStore *dbs) {
     Directory::MetahandlesMap tmp_handles_map;
-    JournalIndex  delete_journals;
+    JournalIndex delete_journals;
     MetahandleSet metahandles_to_purge;
-    base::STLValueDeleter<Directory::MetahandlesMap> deleter(&tmp_handles_map);
     Directory::KernelLoadInfo kernel_load_info;
     return dbs->Load(&tmp_handles_map, &delete_journals, &metahandles_to_purge,
                      &kernel_load_info) == OPENED;
@@ -3329,7 +3327,6 @@ TEST_F(DirectoryBackingStoreTest, MigrateVersion79To80) {
   Directory::MetahandlesMap handles_map;
   JournalIndex delete_journals;
   MetahandleSet metahandles_to_purge;
-  base::STLValueDeleter<Directory::MetahandlesMap> deleter(&handles_map);
   Directory::KernelLoadInfo load_info;
 
   ASSERT_TRUE(dbs->Load(&handles_map, &delete_journals, &metahandles_to_purge,
@@ -3568,7 +3565,6 @@ TEST_F(DirectoryBackingStoreTest, DetectInvalidPosition) {
   Directory::MetahandlesMap handles_map;
   JournalIndex delete_journals;
   MetahandleSet metahandles_to_purge;
-  base::STLValueDeleter<Directory::MetahandlesMap> deleter(&handles_map);
   Directory::KernelLoadInfo kernel_load_info;
   ASSERT_EQ(FAILED_DATABASE_CORRUPT,
             dbs->Load(&handles_map, &delete_journals, &metahandles_to_purge,
@@ -3667,7 +3663,6 @@ TEST_P(MigrationTest, ToCurrentVersion) {
   Directory::MetahandlesMap handles_map;
   JournalIndex delete_journals;
   MetahandleSet metahandles_to_purge;
-  base::STLValueDeleter<Directory::MetahandlesMap> index_deleter(&handles_map);
 
   {
     std::unique_ptr<OnDiskDirectoryBackingStore> dbs(
@@ -4082,10 +4077,9 @@ TEST_F(DirectoryBackingStoreTest, DeleteEntries) {
   std::unique_ptr<TestDirectoryBackingStore> dbs(
       new TestDirectoryBackingStore(GetUsername(), &connection));
   Directory::MetahandlesMap handles_map;
-  JournalIndex  delete_journals;
+  JournalIndex delete_journals;
   MetahandleSet metahandles_to_purge;
   Directory::KernelLoadInfo kernel_load_info;
-  base::STLValueDeleter<Directory::MetahandlesMap> index_deleter(&handles_map);
 
   dbs->Load(&handles_map, &delete_journals, &metahandles_to_purge,
             &kernel_load_info);
@@ -4096,7 +4090,7 @@ TEST_F(DirectoryBackingStoreTest, DeleteEntries) {
   to_delete.insert(first_to_die);
   EXPECT_TRUE(dbs->DeleteEntries(to_delete));
 
-  base::STLDeleteValues(&handles_map);
+  handles_map.clear();
   metahandles_to_purge.clear();
   dbs->LoadEntries(&handles_map, &metahandles_to_purge);
 
@@ -4119,7 +4113,7 @@ TEST_F(DirectoryBackingStoreTest, DeleteEntries) {
 
   EXPECT_TRUE(dbs->DeleteEntries(to_delete));
 
-  base::STLDeleteValues(&handles_map);
+  handles_map.clear();
   metahandles_to_purge.clear();
   dbs->LoadEntries(&handles_map, &metahandles_to_purge);
   EXPECT_EQ(0U, handles_map.size());
@@ -4146,7 +4140,6 @@ TEST_F(DirectoryBackingStoreTest, IncreaseDatabasePageSizeFrom4KTo32K) {
   JournalIndex delete_journals;
   MetahandleSet metahandles_to_purge;
   Directory::KernelLoadInfo kernel_load_info;
-  base::STLValueDeleter<Directory::MetahandlesMap> index_deleter(&handles_map);
 
   DirOpenResult open_result = dbs->Load(
       &handles_map, &delete_journals, &metahandles_to_purge, &kernel_load_info);