| Index: chrome/browser/sync_file_system/drive_backend/leveldb_wrapper.cc
|
| diff --git a/chrome/browser/sync_file_system/drive_backend/leveldb_wrapper.cc b/chrome/browser/sync_file_system/drive_backend/leveldb_wrapper.cc
|
| index 9131c5c15664e65a2e06f55129e3a0b0364f9274..1393e430627e6d9753815a8a86b62478a320823d 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend/leveldb_wrapper.cc
|
| +++ b/chrome/browser/sync_file_system/drive_backend/leveldb_wrapper.cc
|
| @@ -10,6 +10,7 @@
|
| #include <utility>
|
|
|
| #include "base/logging.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "third_party/leveldatabase/src/include/leveldb/db.h"
|
| #include "third_party/leveldatabase/src/include/leveldb/iterator.h"
|
| #include "third_party/leveldatabase/src/include/leveldb/slice.h"
|
| @@ -144,7 +145,7 @@ void LevelDBWrapper::Iterator::AdvanceIterators() {
|
| // ---------------------------------------------------------------------------
|
| // LevelDBWrapper class
|
| // ---------------------------------------------------------------------------
|
| -LevelDBWrapper::LevelDBWrapper(scoped_ptr<leveldb::DB> db)
|
| +LevelDBWrapper::LevelDBWrapper(std::unique_ptr<leveldb::DB> db)
|
| : db_(std::move(db)), num_puts_(0), num_deletes_(0) {
|
| DCHECK(db_);
|
| }
|
| @@ -179,8 +180,8 @@ leveldb::Status LevelDBWrapper::Get(const std::string& key,
|
| return leveldb::Status::NotSupported("Not supported operation.");
|
| }
|
|
|
| -scoped_ptr<LevelDBWrapper::Iterator> LevelDBWrapper::NewIterator() {
|
| - return make_scoped_ptr(new Iterator(this));
|
| +std::unique_ptr<LevelDBWrapper::Iterator> LevelDBWrapper::NewIterator() {
|
| + return base::WrapUnique(new Iterator(this));
|
| }
|
|
|
| leveldb::Status LevelDBWrapper::Commit() {
|
|
|