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

Unified Diff: chrome/browser/sync_file_system/drive_backend/drive_backend_sync_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/drive_backend_sync_unittest.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc b/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc
index b923b98013089ee319ac080a3e195db609d64324..9249fa66c6f79b083a0db019b3d2c5ef76fd7288 100644
--- a/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc
@@ -105,14 +105,13 @@ class DriveBackendSyncTest : public testing::Test,
&profile_, in_memory_env_.get());
local_sync_service_->AddChangeObserver(this);
- scoped_ptr<drive::FakeDriveService>
- drive_service(new drive::FakeDriveService);
+ std::unique_ptr<drive::FakeDriveService> drive_service(
+ new drive::FakeDriveService);
drive_service->Initialize("test@example.com");
ASSERT_TRUE(drive::test_util::SetUpTestEntries(drive_service.get()));
- scoped_ptr<drive::DriveUploaderInterface> uploader(
- new drive::DriveUploader(drive_service.get(),
- file_task_runner_.get()));
+ std::unique_ptr<drive::DriveUploaderInterface> uploader(
+ new drive::DriveUploader(drive_service.get(), file_task_runner_.get()));
fake_drive_service_helper_.reset(new FakeDriveServiceHelper(
drive_service.get(), uploader.get(),
@@ -325,7 +324,7 @@ class DriveBackendSyncTest : public testing::Test,
}
int64_t GetLargestChangeID() {
- scoped_ptr<google_apis::AboutResource> about_resource;
+ std::unique_ptr<google_apis::AboutResource> about_resource;
EXPECT_EQ(google_apis::HTTP_SUCCESS,
fake_drive_service_helper()->GetAboutResource(&about_resource));
if (!about_resource)
@@ -624,16 +623,16 @@ class DriveBackendSyncTest : public testing::Test,
content::TestBrowserThreadBundle thread_bundle_;
base::ScopedTempDir base_dir_;
- scoped_ptr<leveldb::Env> in_memory_env_;
+ std::unique_ptr<leveldb::Env> in_memory_env_;
TestingProfile profile_;
- scoped_ptr<SyncEngine> remote_sync_service_;
- scoped_ptr<LocalFileSyncService> local_sync_service_;
+ std::unique_ptr<SyncEngine> remote_sync_service_;
+ std::unique_ptr<LocalFileSyncService> local_sync_service_;
int64_t pending_remote_changes_;
int64_t pending_local_changes_;
- scoped_ptr<FakeDriveServiceHelper> fake_drive_service_helper_;
+ std::unique_ptr<FakeDriveServiceHelper> fake_drive_service_helper_;
std::map<std::string, CannedSyncableFileSystem*> file_systems_;

Powered by Google App Engine
This is Rietveld 408576698