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

Unified Diff: sync/internal_api/model_type_store_impl_unittest.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/model_type_store_impl_unittest.cc
diff --git a/sync/internal_api/model_type_store_impl_unittest.cc b/sync/internal_api/model_type_store_impl_unittest.cc
index 1a01009079c71d977cd8cf6e8012d18347d05ad2..26c48af5dfbc17f63e7c81589d8a8ecce7a3a62a 100644
--- a/sync/internal_api/model_type_store_impl_unittest.cc
+++ b/sync/internal_api/model_type_store_impl_unittest.cc
@@ -26,7 +26,7 @@ class ModelTypeStoreImplTest : public testing::Test {
ModelTypeStore* store() { return store_.get(); }
void OnInitDone(ModelTypeStore::Result result,
- scoped_ptr<ModelTypeStore> store) {
+ std::unique_ptr<ModelTypeStore> store) {
ASSERT_EQ(ModelTypeStore::Result::SUCCESS, result);
store_ = std::move(store);
}
@@ -43,7 +43,7 @@ class ModelTypeStoreImplTest : public testing::Test {
}
void WriteTestData() {
- scoped_ptr<ModelTypeStore::WriteBatch> write_batch =
+ std::unique_ptr<ModelTypeStore::WriteBatch> write_batch =
store()->CreateWriteBatch();
store()->WriteData(write_batch.get(), "id1", "data1");
store()->WriteMetadata(write_batch.get(), "id1", "metadata1");
@@ -66,19 +66,19 @@ class ModelTypeStoreImplTest : public testing::Test {
static void CaptureResultWithRecords(
ModelTypeStore::Result* dst_result,
- scoped_ptr<ModelTypeStore::RecordList>* dst_records,
+ std::unique_ptr<ModelTypeStore::RecordList>* dst_records,
ModelTypeStore::Result result,
- scoped_ptr<ModelTypeStore::RecordList> records) {
+ std::unique_ptr<ModelTypeStore::RecordList> records) {
*dst_result = result;
*dst_records = std::move(records);
}
static void CaptureResutRecordsAndString(
ModelTypeStore::Result* dst_result,
- scoped_ptr<ModelTypeStore::RecordList>* dst_records,
+ std::unique_ptr<ModelTypeStore::RecordList>* dst_records,
std::string* dst_value,
ModelTypeStore::Result result,
- scoped_ptr<ModelTypeStore::RecordList> records,
+ std::unique_ptr<ModelTypeStore::RecordList> records,
const std::string& value) {
*dst_result = result;
*dst_records = std::move(records);
@@ -87,11 +87,11 @@ class ModelTypeStoreImplTest : public testing::Test {
static void CaptureResutRecordsAndIdList(
ModelTypeStore::Result* dst_result,
- scoped_ptr<ModelTypeStore::RecordList>* dst_records,
- scoped_ptr<ModelTypeStore::IdList>* dst_id_list,
+ std::unique_ptr<ModelTypeStore::RecordList>* dst_records,
+ std::unique_ptr<ModelTypeStore::IdList>* dst_id_list,
ModelTypeStore::Result result,
- scoped_ptr<ModelTypeStore::RecordList> records,
- scoped_ptr<ModelTypeStore::IdList> missing_id_list) {
+ std::unique_ptr<ModelTypeStore::RecordList> records,
+ std::unique_ptr<ModelTypeStore::IdList> missing_id_list) {
*dst_result = result;
*dst_records = std::move(records);
*dst_id_list = std::move(missing_id_list);
@@ -99,7 +99,7 @@ class ModelTypeStoreImplTest : public testing::Test {
private:
base::MessageLoop message_loop_;
- scoped_ptr<ModelTypeStore> store_;
+ std::unique_ptr<ModelTypeStore> store_;
};
// Matcher to verify contents of returned RecordList .
@@ -118,7 +118,7 @@ TEST_F(ModelTypeStoreImplTest, CreateInMemoryStore) {
ASSERT_NE(nullptr, store());
ModelTypeStore::Result result;
- scoped_ptr<ModelTypeStore::RecordList> records;
+ std::unique_ptr<ModelTypeStore::RecordList> records;
store()->ReadAllData(
base::Bind(&CaptureResultWithRecords, &result, &records));
PumpLoop();
@@ -140,7 +140,7 @@ TEST_F(ModelTypeStoreImplTest, WriteThenRead) {
WriteTestData();
ModelTypeStore::Result result;
- scoped_ptr<ModelTypeStore::RecordList> records;
+ std::unique_ptr<ModelTypeStore::RecordList> records;
store()->ReadAllData(
base::Bind(&CaptureResultWithRecords, &result, &records));
PumpLoop();
@@ -167,7 +167,7 @@ TEST_F(ModelTypeStoreImplTest, MissingGlobalMetadata) {
ModelTypeStore::Result result;
- scoped_ptr<ModelTypeStore::WriteBatch> write_batch =
+ std::unique_ptr<ModelTypeStore::WriteBatch> write_batch =
store()->CreateWriteBatch();
store()->DeleteGlobalMetadata(write_batch.get());
store()->CommitWriteBatch(std::move(write_batch),
@@ -175,7 +175,7 @@ TEST_F(ModelTypeStoreImplTest, MissingGlobalMetadata) {
PumpLoop();
ASSERT_EQ(ModelTypeStore::Result::SUCCESS, result);
- scoped_ptr<ModelTypeStore::RecordList> records;
+ std::unique_ptr<ModelTypeStore::RecordList> records;
std::string global_metadata;
store()->ReadAllMetadata(base::Bind(&CaptureResutRecordsAndString, &result,
&records, &global_metadata));
@@ -198,8 +198,8 @@ TEST_F(ModelTypeStoreImplTest, ReadMissingDataRecords) {
id_list.push_back("id1");
id_list.push_back("id3");
- scoped_ptr<ModelTypeStore::RecordList> records;
- scoped_ptr<ModelTypeStore::IdList> missing_id_list;
+ std::unique_ptr<ModelTypeStore::RecordList> records;
+ std::unique_ptr<ModelTypeStore::IdList> missing_id_list;
store()->ReadData(id_list, base::Bind(&CaptureResutRecordsAndIdList, &result,
&records, &missing_id_list));

Powered by Google App Engine
This is Rietveld 408576698