| Index: chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc
|
| diff --git a/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc b/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc
|
| index 08dcb77b7b36158d7f9bff7e17a703f46f43e8ad..c51edc79eb1bf99b2a4fb18bc27c6d8f9835d076 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc
|
| +++ b/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc
|
| @@ -6,12 +6,14 @@
|
|
|
| #include <stddef.h>
|
| #include <stdint.h>
|
| +
|
| #include <utility>
|
| #include <vector>
|
|
|
| #include "base/files/scoped_temp_dir.h"
|
| #include "base/format_macros.h"
|
| #include "base/macros.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/run_loop.h"
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/strings/stringprintf.h"
|
| @@ -51,12 +53,11 @@ class RegisterAppTaskTest : public testing::Test {
|
| ASSERT_TRUE(database_dir_.CreateUniqueTempDir());
|
| in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default()));
|
|
|
| - scoped_ptr<drive::FakeDriveService>
|
| - fake_drive_service(new drive::FakeDriveService);
|
| - scoped_ptr<drive::DriveUploaderInterface>
|
| - drive_uploader(new drive::DriveUploader(
|
| - fake_drive_service.get(),
|
| - base::ThreadTaskRunnerHandle::Get()));
|
| + std::unique_ptr<drive::FakeDriveService> fake_drive_service(
|
| + new drive::FakeDriveService);
|
| + std::unique_ptr<drive::DriveUploaderInterface> drive_uploader(
|
| + new drive::DriveUploader(fake_drive_service.get(),
|
| + base::ThreadTaskRunnerHandle::Get()));
|
|
|
| fake_drive_service_helper_.reset(new FakeDriveServiceHelper(
|
| fake_drive_service.get(), drive_uploader.get(),
|
| @@ -78,7 +79,7 @@ class RegisterAppTaskTest : public testing::Test {
|
| }
|
|
|
| protected:
|
| - scoped_ptr<LevelDBWrapper> OpenLevelDB() {
|
| + std::unique_ptr<LevelDBWrapper> OpenLevelDB() {
|
| leveldb::DB* db = nullptr;
|
| leveldb::Options options;
|
| options.create_if_missing = true;
|
| @@ -86,7 +87,7 @@ class RegisterAppTaskTest : public testing::Test {
|
| leveldb::Status status =
|
| leveldb::DB::Open(options, database_dir_.path().AsUTF8Unsafe(), &db);
|
| EXPECT_TRUE(status.ok());
|
| - return make_scoped_ptr(new LevelDBWrapper(make_scoped_ptr(db)));
|
| + return base::WrapUnique(new LevelDBWrapper(base::WrapUnique(db)));
|
| }
|
|
|
| void SetUpInitialData(LevelDBWrapper* db) {
|
| @@ -120,10 +121,10 @@ class RegisterAppTaskTest : public testing::Test {
|
| EXPECT_TRUE(db->Commit().ok());
|
| }
|
|
|
| - void CreateMetadataDatabase(scoped_ptr<LevelDBWrapper> db) {
|
| + void CreateMetadataDatabase(std::unique_ptr<LevelDBWrapper> db) {
|
| ASSERT_TRUE(db);
|
| ASSERT_FALSE(context_->GetMetadataDatabase());
|
| - scoped_ptr<MetadataDatabase> metadata_db;
|
| + std::unique_ptr<MetadataDatabase> metadata_db;
|
| ASSERT_EQ(
|
| SYNC_STATUS_OK,
|
| MetadataDatabase::CreateForTesting(
|
| @@ -231,7 +232,7 @@ class RegisterAppTaskTest : public testing::Test {
|
| if (!GetAppRootFolderID(app_id, &app_root_folder_id))
|
| return false;
|
|
|
| - scoped_ptr<google_apis::FileResource> entry;
|
| + std::unique_ptr<google_apis::FileResource> entry;
|
| if (google_apis::HTTP_SUCCESS !=
|
| fake_drive_service_helper_->GetFileResource(app_root_folder_id, &entry))
|
| return false;
|
| @@ -260,7 +261,7 @@ class RegisterAppTaskTest : public testing::Test {
|
| return base::StringPrintf("file_id_%" PRId64, next_file_id_++);
|
| }
|
|
|
| - scoped_ptr<leveldb::Env> in_memory_env_;
|
| + std::unique_ptr<leveldb::Env> in_memory_env_;
|
|
|
| std::string sync_root_folder_id_;
|
|
|
| @@ -270,14 +271,14 @@ class RegisterAppTaskTest : public testing::Test {
|
| content::TestBrowserThreadBundle browser_threads_;
|
| base::ScopedTempDir database_dir_;
|
|
|
| - scoped_ptr<SyncEngineContext> context_;
|
| - scoped_ptr<FakeDriveServiceHelper> fake_drive_service_helper_;
|
| + std::unique_ptr<SyncEngineContext> context_;
|
| + std::unique_ptr<FakeDriveServiceHelper> fake_drive_service_helper_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(RegisterAppTaskTest);
|
| };
|
|
|
| TEST_F(RegisterAppTaskTest, AlreadyRegistered) {
|
| - scoped_ptr<LevelDBWrapper> db = OpenLevelDB();
|
| + std::unique_ptr<LevelDBWrapper> db = OpenLevelDB();
|
| ASSERT_TRUE(db);
|
| SetUpInitialData(db.get());
|
|
|
| @@ -292,7 +293,7 @@ TEST_F(RegisterAppTaskTest, AlreadyRegistered) {
|
| }
|
|
|
| TEST_F(RegisterAppTaskTest, CreateAppFolder) {
|
| - scoped_ptr<LevelDBWrapper> db = OpenLevelDB();
|
| + std::unique_ptr<LevelDBWrapper> db = OpenLevelDB();
|
| ASSERT_TRUE(db);
|
| SetUpInitialData(db.get());
|
|
|
| @@ -309,7 +310,7 @@ TEST_F(RegisterAppTaskTest, CreateAppFolder) {
|
| }
|
|
|
| TEST_F(RegisterAppTaskTest, RegisterExistingFolder) {
|
| - scoped_ptr<LevelDBWrapper> db = OpenLevelDB();
|
| + std::unique_ptr<LevelDBWrapper> db = OpenLevelDB();
|
| ASSERT_TRUE(db);
|
| SetUpInitialData(db.get());
|
|
|
| @@ -324,7 +325,7 @@ TEST_F(RegisterAppTaskTest, RegisterExistingFolder) {
|
| }
|
|
|
| TEST_F(RegisterAppTaskTest, RegisterExistingFolder_MultipleCandidate) {
|
| - scoped_ptr<LevelDBWrapper> db = OpenLevelDB();
|
| + std::unique_ptr<LevelDBWrapper> db = OpenLevelDB();
|
| ASSERT_TRUE(db);
|
| SetUpInitialData(db.get());
|
|
|
|
|