Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / browser / indexed_db / leveldb / leveldb_transaction.cc

diff --git a/src/content/browser/indexed_db/leveldb/leveldb_transaction.cc b/src/content/browser/indexed_db/leveldb/leveldb_transaction.cc
index 40e7a50..a9e7109 100644 (file)
--- a/src/content/browser/indexed_db/leveldb/leveldb_transaction.cc
+++ b/src/content/browser/indexed_db/leveldb/leveldb_transaction.cc
@@ -27,9 +27,8 @@ LevelDBTransaction::Record::Record() : deleted(false) {}
 LevelDBTransaction::Record::~Record() {}
 
 void LevelDBTransaction::Clear() {
-  for (DataType::iterator it = data_.begin(); it != data_.end(); ++it) {
-    delete it->second;
-  }
+  for (const auto& it : data_)
+    delete it.second;
   data_.clear();
 }
 
@@ -98,12 +97,11 @@ leveldb::Status LevelDBTransaction::Commit() {
   base::TimeTicks begin_time = base::TimeTicks::Now();
   scoped_ptr<LevelDBWriteBatch> write_batch = LevelDBWriteBatch::Create();
 
-  for (DataType::iterator iterator = data_.begin(); iterator != data_.end();
-       ++iterator) {
-    if (!iterator->second->deleted)
-      write_batch->Put(iterator->first, iterator->second->value);
+  for (const auto& iterator : data_) {
+    if (!iterator.second->deleted)
+      write_batch->Put(iterator.first, iterator.second->value);
     else
-      write_batch->Remove(iterator->first);
+      write_batch->Remove(iterator.first);
   }
 
   leveldb::Status s = db_->Write(*write_batch);
@@ -123,7 +121,7 @@ void LevelDBTransaction::Rollback() {
 }
 
 scoped_ptr<LevelDBIterator> LevelDBTransaction::CreateIterator() {
-  return TransactionIterator::Create(this).PassAs<LevelDBIterator>();
+  return TransactionIterator::Create(this);
 }
 
 scoped_ptr<LevelDBTransaction::DataIterator>
@@ -444,12 +442,8 @@ void LevelDBTransaction::UnregisterIterator(TransactionIterator* iterator) {
 }
 
 void LevelDBTransaction::NotifyIterators() {
-  for (std::set<TransactionIterator*>::iterator i = iterators_.begin();
-       i != iterators_.end();
-       ++i) {
-    TransactionIterator* transaction_iterator = *i;
+  for (auto* transaction_iterator : iterators_)
     transaction_iterator->DataChanged();
-  }
 }
 
 scoped_ptr<LevelDBDirectTransaction> LevelDBDirectTransaction::Create(