sync/internal_api/public/data_batch_impl_unittest.cc - Issue 1866243002: Convert //sync from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: sync/internal_api/public/data_batch_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

« sync/internal_api/public/attachments/attachment_uploader.h ('K') | « sync/internal_api/public/data_batch_impl.cc ('k') | sync/internal_api/public/engine/model_safe_worker.h » ('j') | sync/internal_api/public/http_bridge.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: sync/internal_api/public/data_batch_impl_unittest.cc

diff --git a/sync/internal_api/public/data_batch_impl_unittest.cc b/sync/internal_api/public/data_batch_impl_unittest.cc

index c3b2f79d6edb8b22f9a151afa6bdf5e9352bffea..1dbb82b74ee570526d48136a09338484d09c1089 100644

--- a/sync/internal_api/public/data_batch_impl_unittest.cc

+++ b/sync/internal_api/public/data_batch_impl_unittest.cc

@@ -4,6 +4,7 @@

#include "sync/internal_api/public/data_batch_impl.h"

+#include "base/memory/ptr_util.h"

#include "testing/gtest/include/gtest/gtest.h"

namespace syncer_v2 {

@@ -15,7 +16,7 @@ TEST(DataBatchImplTest, PutAndNextWithReuse) {

DataBatchImpl batch;

EXPECT_FALSE(batch.HasNext());

- batch.Put("one", make_scoped_ptr(entity1));

+ batch.Put("one", base::WrapUnique(entity1));

EXPECT_TRUE(batch.HasNext());

const TagAndData& pair1 = batch.Next();

@@ -23,7 +24,7 @@ TEST(DataBatchImplTest, PutAndNextWithReuse) {

EXPECT_EQ("one", pair1.first);

EXPECT_EQ(entity1, pair1.second.get());

- batch.Put("two", make_scoped_ptr(entity2));

+ batch.Put("two", base::WrapUnique(entity2));

EXPECT_TRUE(batch.HasNext());

const TagAndData& pair2 = batch.Next();

@@ -40,9 +41,9 @@ TEST(DataBatchImplTest, PutAndNextInterleaved) {

DataBatchImpl batch;

EXPECT_FALSE(batch.HasNext());

- batch.Put("one", make_scoped_ptr(entity1));

+ batch.Put("one", base::WrapUnique(entity1));

EXPECT_TRUE(batch.HasNext());

- batch.Put("two", make_scoped_ptr(entity2));

+ batch.Put("two", base::WrapUnique(entity2));

EXPECT_TRUE(batch.HasNext());

const TagAndData& pair1 = batch.Next();

@@ -50,7 +51,7 @@ TEST(DataBatchImplTest, PutAndNextInterleaved) {

EXPECT_EQ("one", pair1.first);

EXPECT_EQ(entity1, pair1.second.get());

- batch.Put("three", make_scoped_ptr(entity3));

+ batch.Put("three", base::WrapUnique(entity3));

EXPECT_TRUE(batch.HasNext());

const TagAndData& pair2 = batch.Next();

@@ -71,9 +72,9 @@ TEST(DataBatchImplTest, PutAndNextSharedTag) {

DataBatchImpl batch;

EXPECT_FALSE(batch.HasNext());

- batch.Put("same", make_scoped_ptr(entity1));

+ batch.Put("same", base::WrapUnique(entity1));

EXPECT_TRUE(batch.HasNext());

- batch.Put("same", make_scoped_ptr(entity2));

+ batch.Put("same", base::WrapUnique(entity2));

EXPECT_TRUE(batch.HasNext());

const TagAndData& pair1 = batch.Next();