Remove stl_util's STLValueDeleter.

components/sync/syncable/directory.h

 // Copyright 2013 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.
 
 #ifndef COMPONENTS_SYNC_SYNCABLE_DIRECTORY_H_
 #define COMPONENTS_SYNC_SYNCABLE_DIRECTORY_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <deque>
+#include <memory>
 #include <set>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/containers/hash_tables.h"
 #include "base/files/file_util.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
@@ skipping 33 matching lines @@
 
 // Directory stores and manages EntryKernels.
 //
 // This class is tightly coupled to several other classes via Directory::Kernel.
 // Although Directory's kernel_ is exposed via public accessor it should be
 // treated as pseudo-private.
 class Directory {
  public:
   typedef std::vector<int64_t> Metahandles;
 
-  typedef std::unordered_map<int64_t, EntryKernel*> MetahandlesMap;
+  typedef std::unordered_map<int64_t, std::unique_ptr<EntryKernel>>
+      MetahandlesMap;
   typedef std::unordered_map<std::string, EntryKernel*> IdsMap;
   typedef std::unordered_map<std::string, EntryKernel*> TagsMap;
   typedef std::string AttachmentIdUniqueId;
   typedef std::unordered_map<AttachmentIdUniqueId, MetahandleSet>
       IndexByAttachmentId;
 
   static const base::FilePath::CharType kSyncDatabaseFilename[];
 
   // The dirty/clean state of kernel fields backed by the share_info table.
   // This is public so it can be used in SaveChangesSnapshot for persistence.
@@ skipping 86 matching lines @@
     // Protects all members below.
     // The mutex effectively protects all the indices, but not the
     // entries themselves.  So once a pointer to an entry is pulled
     // from the index, the mutex can be unlocked and entry read or written.
     //
     // Never hold the mutex and do anything with the database or any
     // other buffered IO.  Violating this rule will result in deadlock.
     mutable base::Lock mutex;
 
     // Entries indexed by metahandle.  This container is considered to be the
-    // owner of all EntryKernels, which may be referened by the other
+    // owner of all EntryKernels, which may be referenced by the other
     // containers.  If you remove an EntryKernel from this map, you probably
-    // want to remove it from all other containers and delete it, too.
+    // want to remove it from all other containers.
     MetahandlesMap metahandles_map;
 
     // Entries indexed by id
     IdsMap ids_map;
 
     // Entries indexed by server tag.
     // This map does not include any entries with non-existent server tags.
     TagsMap server_tags_map;
 
     // Entries indexed by client tag.
@@ skipping 465 matching lines @@
 
   base::WeakPtrFactory<Directory> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Directory);
 };
 
 }  // namespace syncable
 }  // namespace syncer
 
 #endif  // COMPONENTS_SYNC_SYNCABLE_DIRECTORY_H_