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

Unified Diff: sync/internal_api/test/model_type_store_test_util.cc

Issue 1866243002: Convert //sync 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: sync/internal_api/test/model_type_store_test_util.cc
diff --git a/sync/internal_api/test/model_type_store_test_util.cc b/sync/internal_api/test/model_type_store_test_util.cc
index 1897ade04e4f67db41a678ad9c9eed3140fd60d5..4780844e37ebca0529e213dbbcd19ac011f29c62 100644
--- a/sync/internal_api/test/model_type_store_test_util.cc
+++ b/sync/internal_api/test/model_type_store_test_util.cc
@@ -16,9 +16,9 @@ using Result = ModelTypeStore::Result;
namespace {
-void MoveStoreToScopedPtr(scoped_ptr<ModelTypeStore>* out_store,
+void MoveStoreToScopedPtr(std::unique_ptr<ModelTypeStore>* out_store,
Result result,
- scoped_ptr<ModelTypeStore> in_store) {
+ std::unique_ptr<ModelTypeStore> in_store) {
ASSERT_EQ(Result::SUCCESS, result);
std::swap(*out_store, in_store);
}
@@ -26,9 +26,9 @@ void MoveStoreToScopedPtr(scoped_ptr<ModelTypeStore>* out_store,
} // namespace
// static
-scoped_ptr<ModelTypeStore>
+std::unique_ptr<ModelTypeStore>
ModelTypeStoreTestUtil::CreateInMemoryStoreForTest() {
- scoped_ptr<ModelTypeStore> store;
+ std::unique_ptr<ModelTypeStore> store;
ModelTypeStore::CreateInMemoryStoreForTest(
base::Bind(&MoveStoreToScopedPtr, &store));
@@ -41,7 +41,7 @@ ModelTypeStoreTestUtil::CreateInMemoryStoreForTest() {
// static
void ModelTypeStoreTestUtil::MoveStoreToCallback(
- scoped_ptr<ModelTypeStore> store,
+ std::unique_ptr<ModelTypeStore> store,
const ModelTypeStore::InitCallback& callback) {
ASSERT_TRUE(store);
callback.Run(Result::SUCCESS, std::move(store));

Powered by Google App Engine
This is Rietveld 408576698