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

Unified Diff: chrome/browser/sync_file_system/sync_file_system_service_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/sync_file_system_service_unittest.cc
diff --git a/chrome/browser/sync_file_system/sync_file_system_service_unittest.cc b/chrome/browser/sync_file_system/sync_file_system_service_unittest.cc
index 6cb5911b8a8ef6456ae3df31040cfa3391674c76..a984c426e914a8f148280d92a44be973b5fbd0bc 100644
--- a/chrome/browser/sync_file_system/sync_file_system_service_unittest.cc
+++ b/chrome/browser/sync_file_system/sync_file_system_service_unittest.cc
@@ -141,7 +141,7 @@ class SyncFileSystemServiceTest : public testing::Test {
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO),
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)));
- scoped_ptr<LocalFileSyncService> local_service =
+ std::unique_ptr<LocalFileSyncService> local_service =
LocalFileSyncService::CreateForTesting(&profile_, in_memory_env_.get());
remote_service_ = new StrictMock<MockRemoteFileSyncService>;
sync_service_.reset(new SyncFileSystemService(&profile_));
@@ -158,7 +158,7 @@ class SyncFileSystemServiceTest : public testing::Test {
sync_service_->Initialize(
std::move(local_service),
- scoped_ptr<RemoteFileSyncService>(remote_service_));
+ std::unique_ptr<RemoteFileSyncService>(remote_service_));
// Disable auto sync by default.
EXPECT_CALL(*mock_remote_service(), SetSyncEnabled(false)).Times(1);
@@ -264,15 +264,15 @@ class SyncFileSystemServiceTest : public testing::Test {
}
content::TestBrowserThreadBundle thread_bundle_;
- scoped_ptr<leveldb::Env> in_memory_env_;
+ std::unique_ptr<leveldb::Env> in_memory_env_;
TestingProfile profile_;
- scoped_ptr<CannedSyncableFileSystem> file_system_;
+ std::unique_ptr<CannedSyncableFileSystem> file_system_;
// Their ownerships are transferred to SyncFileSystemService.
StrictMock<MockRemoteFileSyncService>* remote_service_;
StrictMock<MockLocalChangeProcessor> local_change_processor_;
- scoped_ptr<SyncFileSystemService> sync_service_;
+ std::unique_ptr<SyncFileSystemService> sync_service_;
};
TEST_F(SyncFileSystemServiceTest, InitializeForApp) {

Powered by Google App Engine
This is Rietveld 408576698