Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8250)

Unified Diff: chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc

Issue 1873683002: Convert //chrome/browser/sync_file_system from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc
index 2ac832122456f3451ac12a4b4456e27ccff0b7f7..01a62d7710032be9eb06febd56f7e593bd05ee4c 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc
@@ -41,7 +41,7 @@ const int64_t kInitialLargestChangeID = 1234;
class SyncEngineInitializerTest : public testing::Test {
public:
struct TrackedFile {
- scoped_ptr<google_apis::FileResource> resource;
+ std::unique_ptr<google_apis::FileResource> resource;
FileMetadata metadata;
FileTracker tracker;
};
@@ -53,14 +53,14 @@ class SyncEngineInitializerTest : 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);
+ std::unique_ptr<drive::FakeDriveService> fake_drive_service(
+ new drive::FakeDriveService);
fake_drive_service_ = fake_drive_service.get();
sync_context_.reset(new SyncEngineContext(
std::move(fake_drive_service),
- scoped_ptr<drive::DriveUploaderInterface>(), nullptr /* task_logger */,
- base::ThreadTaskRunnerHandle::Get(),
+ std::unique_ptr<drive::DriveUploaderInterface>(),
+ nullptr /* task_logger */, base::ThreadTaskRunnerHandle::Get(),
base::ThreadTaskRunnerHandle::Get(), nullptr /* worker_pool */));
sync_task_manager_.reset(new SyncTaskManager(
@@ -90,8 +90,7 @@ class SyncEngineInitializerTest : public testing::Test {
SyncStatusCode status = SYNC_STATUS_UNKNOWN;
sync_task_manager_->ScheduleSyncTask(
- FROM_HERE,
- scoped_ptr<SyncTask>(initializer),
+ FROM_HERE, std::unique_ptr<SyncTask>(initializer),
SyncTaskManager::PRIORITY_MED,
base::Bind(&SyncEngineInitializerTest::DidRunInitializer,
base::Unretained(this), initializer, &status));
@@ -112,7 +111,7 @@ class SyncEngineInitializerTest : public testing::Test {
const google_apis::FileResource** app_roots,
size_t app_roots_count) {
SyncStatusCode status = SYNC_STATUS_UNKNOWN;
- scoped_ptr<MetadataDatabase> database = MetadataDatabase::Create(
+ std::unique_ptr<MetadataDatabase> database = MetadataDatabase::Create(
database_path(), in_memory_env_.get(), &status);
if (status != SYNC_STATUS_OK)
return status;
@@ -132,11 +131,11 @@ class SyncEngineInitializerTest : public testing::Test {
return status;
}
- scoped_ptr<google_apis::FileResource> CreateRemoteFolder(
+ std::unique_ptr<google_apis::FileResource> CreateRemoteFolder(
const std::string& parent_folder_id,
const std::string& title) {
google_apis::DriveApiErrorCode error = google_apis::DRIVE_OTHER_ERROR;
- scoped_ptr<google_apis::FileResource> entry;
+ std::unique_ptr<google_apis::FileResource> entry;
drive::AddNewDirectoryOptions options;
options.visibility = google_apis::drive::FILE_VISIBILITY_PRIVATE;
sync_context_->GetDriveService()->AddNewDirectory(
@@ -148,8 +147,8 @@ class SyncEngineInitializerTest : public testing::Test {
return entry;
}
- scoped_ptr<google_apis::FileResource> CreateRemoteSyncRoot() {
- scoped_ptr<google_apis::FileResource> sync_root(
+ std::unique_ptr<google_apis::FileResource> CreateRemoteSyncRoot() {
+ std::unique_ptr<google_apis::FileResource> sync_root(
CreateRemoteFolder(std::string(), kSyncRootFolderTitle));
for (size_t i = 0; i < sync_root->parents().size(); ++i) {
@@ -198,7 +197,7 @@ class SyncEngineInitializerTest : public testing::Test {
bool HasNoParent(const std::string& file_id) {
google_apis::DriveApiErrorCode error = google_apis::DRIVE_OTHER_ERROR;
- scoped_ptr<google_apis::FileResource> entry;
+ std::unique_ptr<google_apis::FileResource> entry;
sync_context_->GetDriveService()->GetFileResource(
file_id,
CreateResultReceiver(&error, &entry));
@@ -229,11 +228,11 @@ class SyncEngineInitializerTest : public testing::Test {
private:
content::TestBrowserThreadBundle browser_threads_;
base::ScopedTempDir database_dir_;
- scoped_ptr<leveldb::Env> in_memory_env_;
+ std::unique_ptr<leveldb::Env> in_memory_env_;
- scoped_ptr<MetadataDatabase> metadata_database_;
- scoped_ptr<SyncTaskManager> sync_task_manager_;
- scoped_ptr<SyncEngineContext> sync_context_;
+ std::unique_ptr<MetadataDatabase> metadata_database_;
+ std::unique_ptr<SyncTaskManager> sync_task_manager_;
+ std::unique_ptr<SyncEngineContext> sync_context_;
drive::FakeDriveService* fake_drive_service_ = nullptr;
DISALLOW_COPY_AND_ASSIGN(SyncEngineInitializerTest);
@@ -253,11 +252,10 @@ TEST_F(SyncEngineInitializerTest, EmptyDatabase_NoRemoteSyncRoot) {
}
TEST_F(SyncEngineInitializerTest, EmptyDatabase_RemoteSyncRootExists) {
- scoped_ptr<google_apis::FileResource> sync_root(
- CreateRemoteSyncRoot());
- scoped_ptr<google_apis::FileResource> app_root_1(
+ std::unique_ptr<google_apis::FileResource> sync_root(CreateRemoteSyncRoot());
+ std::unique_ptr<google_apis::FileResource> app_root_1(
CreateRemoteFolder(sync_root->file_id(), "app-root 1"));
- scoped_ptr<google_apis::FileResource> app_root_2(
+ std::unique_ptr<google_apis::FileResource> app_root_2(
CreateRemoteFolder(sync_root->file_id(), "app-root 2"));
EXPECT_EQ(SYNC_STATUS_OK, RunInitializer());
@@ -275,10 +273,10 @@ TEST_F(SyncEngineInitializerTest, EmptyDatabase_RemoteSyncRootExists) {
}
TEST_F(SyncEngineInitializerTest, DatabaseAlreadyInitialized) {
- scoped_ptr<google_apis::FileResource> sync_root(CreateRemoteSyncRoot());
- scoped_ptr<google_apis::FileResource> app_root_1(
+ std::unique_ptr<google_apis::FileResource> sync_root(CreateRemoteSyncRoot());
+ std::unique_ptr<google_apis::FileResource> app_root_1(
CreateRemoteFolder(sync_root->file_id(), "app-root 1"));
- scoped_ptr<google_apis::FileResource> app_root_2(
+ std::unique_ptr<google_apis::FileResource> app_root_2(
CreateRemoteFolder(sync_root->file_id(), "app-root 2"));
const google_apis::FileResource* app_roots[] = {
@@ -302,8 +300,10 @@ TEST_F(SyncEngineInitializerTest, DatabaseAlreadyInitialized) {
}
TEST_F(SyncEngineInitializerTest, EmptyDatabase_MultiCandidate) {
- scoped_ptr<google_apis::FileResource> sync_root_1(CreateRemoteSyncRoot());
- scoped_ptr<google_apis::FileResource> sync_root_2(CreateRemoteSyncRoot());
+ std::unique_ptr<google_apis::FileResource> sync_root_1(
+ CreateRemoteSyncRoot());
+ std::unique_ptr<google_apis::FileResource> sync_root_2(
+ CreateRemoteSyncRoot());
EXPECT_EQ(SYNC_STATUS_OK, RunInitializer());
@@ -318,8 +318,8 @@ TEST_F(SyncEngineInitializerTest, EmptyDatabase_MultiCandidate) {
}
TEST_F(SyncEngineInitializerTest, EmptyDatabase_UndetachedRemoteSyncRoot) {
- scoped_ptr<google_apis::FileResource> sync_root(CreateRemoteFolder(
- std::string(), kSyncRootFolderTitle));
+ std::unique_ptr<google_apis::FileResource> sync_root(
+ CreateRemoteFolder(std::string(), kSyncRootFolderTitle));
EXPECT_EQ(SYNC_STATUS_OK, RunInitializer());
EXPECT_EQ(1u, CountTrackersForFile(sync_root->file_id()));
@@ -332,10 +332,10 @@ TEST_F(SyncEngineInitializerTest, EmptyDatabase_UndetachedRemoteSyncRoot) {
}
TEST_F(SyncEngineInitializerTest, EmptyDatabase_MultiparentSyncRoot) {
- scoped_ptr<google_apis::FileResource> folder(CreateRemoteFolder(
- std::string(), "folder"));
- scoped_ptr<google_apis::FileResource> sync_root(CreateRemoteFolder(
- std::string(), kSyncRootFolderTitle));
+ std::unique_ptr<google_apis::FileResource> folder(
+ CreateRemoteFolder(std::string(), "folder"));
+ std::unique_ptr<google_apis::FileResource> sync_root(
+ CreateRemoteFolder(std::string(), kSyncRootFolderTitle));
AddParentFolder(sync_root->file_id(), folder->file_id());
EXPECT_EQ(SYNC_STATUS_OK, RunInitializer());
@@ -350,10 +350,10 @@ TEST_F(SyncEngineInitializerTest, EmptyDatabase_MultiparentSyncRoot) {
}
TEST_F(SyncEngineInitializerTest, EmptyDatabase_FakeRemoteSyncRoot) {
- scoped_ptr<google_apis::FileResource> folder(CreateRemoteFolder(
- std::string(), "folder"));
- scoped_ptr<google_apis::FileResource> sync_root(CreateRemoteFolder(
- folder->file_id(), kSyncRootFolderTitle));
+ std::unique_ptr<google_apis::FileResource> folder(
+ CreateRemoteFolder(std::string(), "folder"));
+ std::unique_ptr<google_apis::FileResource> sync_root(
+ CreateRemoteFolder(folder->file_id(), kSyncRootFolderTitle));
EXPECT_EQ(SYNC_STATUS_OK, RunInitializer());

Powered by Google App Engine
This is Rietveld 408576698