| Index: chrome/browser/sync_file_system/drive_backend/metadata_db_migration_util_unittest.cc
|
| diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_db_migration_util_unittest.cc b/chrome/browser/sync_file_system/drive_backend/metadata_db_migration_util_unittest.cc
|
| index da6eb5e080dd64b47bbc789e10f216687da6db31..b8f59e14c0b27dc33fab51ba2ffd8953b86248ce 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend/metadata_db_migration_util_unittest.cc
|
| +++ b/chrome/browser/sync_file_system/drive_backend/metadata_db_migration_util_unittest.cc
|
| @@ -4,10 +4,10 @@
|
|
|
| #include "chrome/browser/sync_file_system/drive_backend/metadata_db_migration_util.h"
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/files/scoped_temp_dir.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/strings/string_util.h"
|
| #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h"
|
| @@ -29,7 +29,8 @@ namespace {
|
| void VerifyKeyAndValue(const std::string& key,
|
| const std::string& expect_val,
|
| leveldb::DB* db) {
|
| - scoped_ptr<leveldb::Iterator> itr(db->NewIterator(leveldb::ReadOptions()));
|
| + std::unique_ptr<leveldb::Iterator> itr(
|
| + db->NewIterator(leveldb::ReadOptions()));
|
|
|
| itr->Seek(key);
|
| EXPECT_TRUE(itr->Valid());
|
| @@ -37,7 +38,8 @@ void VerifyKeyAndValue(const std::string& key,
|
| }
|
|
|
| void VerifyNotExist(const std::string& key, leveldb::DB* db) {
|
| - scoped_ptr<leveldb::Iterator> itr(db->NewIterator(leveldb::ReadOptions()));
|
| + std::unique_ptr<leveldb::Iterator> itr(
|
| + db->NewIterator(leveldb::ReadOptions()));
|
|
|
| itr->Seek(key);
|
| EXPECT_TRUE(!itr->Valid() ||
|
| @@ -80,7 +82,7 @@ TEST(DriveMetadataDBMigrationUtilTest, RollbackFromV4ToV3) {
|
| leveldb::Status status = leveldb::DB::Open(options, db_dir, &db_ptr);
|
| ASSERT_TRUE(status.ok());
|
| }
|
| - scoped_ptr<leveldb::DB> db(db_ptr);
|
| + std::unique_ptr<leveldb::DB> db(db_ptr);
|
|
|
| // Setup the database with the schema version 4, without IDs.
|
| leveldb::WriteBatch batch;
|
|
|