IndexedDB: WrapUnique(new T(args..)) -> MakeUnique<T>(args...)

content/browser/indexed_db/leveldb/leveldb_transaction.cc

 // Copyright (c) 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.
 
 #include "content/browser/indexed_db/leveldb/leveldb_transaction.h"
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram.h"
 #include "base/time/time.h"
@@ skipping 10 matching lines @@
     : db_(db),
       snapshot_(db),
       comparator_(db->Comparator()),
       data_comparator_(comparator_),
       data_(data_comparator_),
       finished_(false) {}
 
 LevelDBTransaction::Record::Record() : deleted(false) {}
 LevelDBTransaction::Record::~Record() {}
 
-void LevelDBTransaction::Clear() {
-  for (const auto& it : data_)
-    delete it.second;
-  data_.clear();
-}
-
-LevelDBTransaction::~LevelDBTransaction() { Clear(); }
+LevelDBTransaction::~LevelDBTransaction() {}
 
 bool LevelDBTransaction::Set(const StringPiece& key,
                              std::string* value,
                              bool deleted) {
   DCHECK(!finished_);
   DataType::iterator it = data_.find(key);
 
   if (it == data_.end()) {
-    Record* record = new Record();
+    std::unique_ptr<Record> record = base::MakeUnique<Record>();
     record->key.assign(key.begin(), key.end() - key.begin());
     record->value.swap(*value);
     record->deleted = deleted;
-    data_[record->key] = record;
+    data_[record->key] = std::move(record);
     NotifyIterators();
     return false;
   }
   bool replaced_deleted_value = it->second->deleted;
   it->second->value.swap(*value);
   it->second->deleted = deleted;
   return replaced_deleted_value;
 }
 
 void LevelDBTransaction::Put(const StringPiece& key, std::string* value) {
@@ skipping 39 matching lines @@
 
   base::TimeTicks begin_time = base::TimeTicks::Now();
   std::unique_ptr<LevelDBWriteBatch> write_batch = LevelDBWriteBatch::Create();
 
   auto it = data_.begin();
   while (it != data_.end()) {
     if (!it->second->deleted)
       write_batch->Put(it->first, it->second->value);
     else
       write_batch->Remove(it->first);
-
-    delete it->second;
     data_.erase(it++);
   }
 
   DCHECK(data_.empty());
 
   leveldb::Status s = db_->Write(*write_batch);
   if (s.ok()) {
     finished_ = true;
     UMA_HISTOGRAM_TIMES("WebCore.IndexedDB.LevelDB.Transaction.CommitTime",
                          base::TimeTicks::Now() - begin_time);
   }
   return s;
 }
 
 void LevelDBTransaction::Rollback() {
   DCHECK(!finished_);
   finished_ = true;
-  Clear();
+  data_.clear();
 }
 
 std::unique_ptr<LevelDBIterator> LevelDBTransaction::CreateIterator() {
   return TransactionIterator::Create(this);
 }
 
 std::unique_ptr<LevelDBTransaction::DataIterator>
 LevelDBTransaction::DataIterator::Create(LevelDBTransaction* transaction) {
   return base::WrapUnique(new DataIterator(transaction));
 }
@@ skipping 355 matching lines @@
 
   leveldb::Status s = db_->Write(*write_batch_);
   if (s.ok()) {
     finished_ = true;
     write_batch_->Clear();
   }
   return s;
 }
 
 }  // namespace content