Remove stl_util's STLValueDeleter.

components/sync/syncable/directory_backing_store.cc

 // Copyright 2012 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 "components/sync/syncable/directory_backing_store.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <limits>
@@ skipping 663 matching lines @@
 
     int64_t handle = kernel->ref(META_HANDLE);
     if (SafeToPurgeOnLoading(*kernel)) {
       metahandles_to_purge->insert(handle);
     } else {
       ModelType model_type = kernel->GetModelType();
       if (!IsRealDataType(model_type)) {
         model_type = kernel->GetServerModelType();
       }
       ++model_type_entry_count[model_type];
-      (*handles_map)[handle] = kernel.release();
+      (*handles_map)[handle] = std::move(kernel);
     }
   }
 
   UploadModelTypeEntryCount(total_specifics_copies, model_type_entry_count);
 
   return s.Succeeded();
 }
 
 bool DirectoryBackingStore::SafeToPurgeOnLoading(
     const EntryKernel& entry) const {
@@ skipping 949 matching lines @@
 // whose PARENT_ID values refer to ID values that do not actually exist.
 // Returns true on success.
 bool DirectoryBackingStore::VerifyReferenceIntegrity(
     const Directory::MetahandlesMap* handles_map) {
   TRACE_EVENT0("sync", "SyncDatabaseIntegrityCheck");
   typedef std::unordered_set<std::string> IdsSet;
 
   IdsSet ids_set;
   bool is_ok = true;
 
-  for (Directory::MetahandlesMap::const_iterator it = handles_map->begin();
-       it != handles_map->end(); ++it) {
-    EntryKernel* entry = it->second;
+  for (auto it = handles_map->begin(); it != handles_map->end(); ++it) {
+    EntryKernel* entry = it->second.get();
     bool is_duplicate_id = !(ids_set.insert(entry->ref(ID).value()).second);
     is_ok = is_ok && !is_duplicate_id;
   }
 
   IdsSet::iterator end = ids_set.end();
-  for (Directory::MetahandlesMap::const_iterator it = handles_map->begin();
-       it != handles_map->end(); ++it) {
-    EntryKernel* entry = it->second;
+  for (auto it = handles_map->begin(); it != handles_map->end(); ++it) {
+    EntryKernel* entry = it->second.get();
     if (!entry->ref(PARENT_ID).IsNull()) {
       bool parent_exists = (ids_set.find(entry->ref(PARENT_ID).value()) != end);
       if (!parent_exists) {
         return false;
       }
     }
   }
   return is_ok;
 }
 
@@ skipping 86 matching lines @@
   DCHECK(CalledOnValidThread());
   DCHECK(!catastrophic_error_handler.is_null());
   catastrophic_error_handler_ = catastrophic_error_handler;
   sql::Connection::ErrorCallback error_callback =
       base::Bind(&OnSqliteError, catastrophic_error_handler_);
   db_->set_error_callback(error_callback);
 }
 
 }  // namespace syncable
 }  // namespace syncer