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

Unified Diff: sync/engine/get_updates_processor_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/engine/get_updates_processor_unittest.cc
diff --git a/sync/engine/get_updates_processor_unittest.cc b/sync/engine/get_updates_processor_unittest.cc
index db3ea8c5083e2fd585c0f21d3d8b6f2547374ea3..b7920f3d1a0feba0b409e05e16d935f7779c4e56 100644
--- a/sync/engine/get_updates_processor_unittest.cc
+++ b/sync/engine/get_updates_processor_unittest.cc
@@ -28,7 +28,7 @@ namespace syncer {
namespace {
-scoped_ptr<InvalidationInterface> BuildInvalidation(
+std::unique_ptr<InvalidationInterface> BuildInvalidation(
int64_t version,
const std::string& payload) {
return MockInvalidation::Build(version, payload);
@@ -55,9 +55,9 @@ class GetUpdatesProcessorTest : public ::testing::Test {
return enabled_types_;
}
- scoped_ptr<GetUpdatesProcessor> BuildGetUpdatesProcessor(
+ std::unique_ptr<GetUpdatesProcessor> BuildGetUpdatesProcessor(
const GetUpdatesDelegate& delegate) {
- return scoped_ptr<GetUpdatesProcessor>(
+ return std::unique_ptr<GetUpdatesProcessor>(
new GetUpdatesProcessor(&update_handler_map_, delegate));
}
@@ -101,7 +101,7 @@ class GetUpdatesProcessorTest : public ::testing::Test {
ModelTypeSet enabled_types_;
UpdateHandlerMap update_handler_map_;
STLValueDeleter<UpdateHandlerMap> update_handler_deleter_;
- scoped_ptr<GetUpdatesProcessor> get_updates_processor_;
+ std::unique_ptr<GetUpdatesProcessor> get_updates_processor_;
DISALLOW_COPY_AND_ASSIGN(GetUpdatesProcessorTest);
};
@@ -113,7 +113,7 @@ TEST_F(GetUpdatesProcessorTest, BookmarkNudge) {
sync_pb::ClientToServerMessage message;
NormalGetUpdatesDelegate normal_delegate(nudge_tracker);
- scoped_ptr<GetUpdatesProcessor> processor(
+ std::unique_ptr<GetUpdatesProcessor> processor(
BuildGetUpdatesProcessor(normal_delegate));
processor->PrepareGetUpdates(enabled_types(), &message);
@@ -161,7 +161,7 @@ TEST_F(GetUpdatesProcessorTest, NotifyMany) {
sync_pb::ClientToServerMessage message;
NormalGetUpdatesDelegate normal_delegate(nudge_tracker);
- scoped_ptr<GetUpdatesProcessor> processor(
+ std::unique_ptr<GetUpdatesProcessor> processor(
BuildGetUpdatesProcessor(normal_delegate));
processor->PrepareGetUpdates(enabled_types(), &message);
@@ -201,7 +201,7 @@ TEST_F(GetUpdatesProcessorTest, InitialSyncRequest) {
sync_pb::ClientToServerMessage message;
NormalGetUpdatesDelegate normal_delegate(nudge_tracker);
- scoped_ptr<GetUpdatesProcessor> processor(
+ std::unique_ptr<GetUpdatesProcessor> processor(
BuildGetUpdatesProcessor(normal_delegate));
processor->PrepareGetUpdates(enabled_types(), &message);
@@ -233,7 +233,7 @@ TEST_F(GetUpdatesProcessorTest, ConfigureTest) {
sync_pb::ClientToServerMessage message;
ConfigureGetUpdatesDelegate configure_delegate(
sync_pb::GetUpdatesCallerInfo::RECONFIGURATION);
- scoped_ptr<GetUpdatesProcessor> processor(
+ std::unique_ptr<GetUpdatesProcessor> processor(
BuildGetUpdatesProcessor(configure_delegate));
processor->PrepareGetUpdates(enabled_types(), &message);
@@ -254,7 +254,7 @@ TEST_F(GetUpdatesProcessorTest, ConfigureTest) {
TEST_F(GetUpdatesProcessorTest, PollTest) {
sync_pb::ClientToServerMessage message;
PollGetUpdatesDelegate poll_delegate;
- scoped_ptr<GetUpdatesProcessor> processor(
+ std::unique_ptr<GetUpdatesProcessor> processor(
BuildGetUpdatesProcessor(poll_delegate));
processor->PrepareGetUpdates(enabled_types(), &message);
@@ -284,7 +284,7 @@ TEST_F(GetUpdatesProcessorTest, RetryTest) {
sync_pb::ClientToServerMessage message;
NormalGetUpdatesDelegate normal_delegate(nudge_tracker);
- scoped_ptr<GetUpdatesProcessor> processor(
+ std::unique_ptr<GetUpdatesProcessor> processor(
BuildGetUpdatesProcessor(normal_delegate));
processor->PrepareGetUpdates(enabled_types(), &message);
@@ -318,7 +318,7 @@ TEST_F(GetUpdatesProcessorTest, NudgeWithRetryTest) {
sync_pb::ClientToServerMessage message;
NormalGetUpdatesDelegate normal_delegate(nudge_tracker);
- scoped_ptr<GetUpdatesProcessor> processor(
+ std::unique_ptr<GetUpdatesProcessor> processor(
BuildGetUpdatesProcessor(normal_delegate));
processor->PrepareGetUpdates(enabled_types(), &message);
@@ -342,7 +342,7 @@ TEST_F(GetUpdatesProcessorTest, InvalidResponse) {
sessions::NudgeTracker nudge_tracker;
NormalGetUpdatesDelegate normal_delegate(nudge_tracker);
sessions::StatusController status;
- scoped_ptr<GetUpdatesProcessor> processor(
+ std::unique_ptr<GetUpdatesProcessor> processor(
BuildGetUpdatesProcessor(normal_delegate));
SyncerError error = processor->ProcessResponse(gu_response,
enabled_types(),
@@ -359,7 +359,7 @@ TEST_F(GetUpdatesProcessorTest, MoreToDownloadResponse) {
sessions::NudgeTracker nudge_tracker;
NormalGetUpdatesDelegate normal_delegate(nudge_tracker);
sessions::StatusController status;
- scoped_ptr<GetUpdatesProcessor> processor(
+ std::unique_ptr<GetUpdatesProcessor> processor(
BuildGetUpdatesProcessor(normal_delegate));
SyncerError error = processor->ProcessResponse(gu_response,
enabled_types(),
@@ -376,7 +376,7 @@ TEST_F(GetUpdatesProcessorTest, NormalResponseTest) {
sessions::NudgeTracker nudge_tracker;
NormalGetUpdatesDelegate normal_delegate(nudge_tracker);
sessions::StatusController status;
- scoped_ptr<GetUpdatesProcessor> processor(
+ std::unique_ptr<GetUpdatesProcessor> processor(
BuildGetUpdatesProcessor(normal_delegate));
SyncerError error = processor->ProcessResponse(gu_response,
enabled_types(),
@@ -420,7 +420,7 @@ class GetUpdatesProcessorApplyUpdatesTest : public GetUpdatesProcessorTest {
TEST_F(GetUpdatesProcessorApplyUpdatesTest, Normal) {
sessions::NudgeTracker nudge_tracker;
NormalGetUpdatesDelegate normal_delegate(nudge_tracker);
- scoped_ptr<GetUpdatesProcessor> processor(
+ std::unique_ptr<GetUpdatesProcessor> processor(
BuildGetUpdatesProcessor(normal_delegate));
EXPECT_EQ(0, GetNonAppliedHandler()->GetApplyUpdatesCount());
@@ -443,7 +443,7 @@ TEST_F(GetUpdatesProcessorApplyUpdatesTest, Normal) {
TEST_F(GetUpdatesProcessorApplyUpdatesTest, Configure) {
ConfigureGetUpdatesDelegate configure_delegate(
sync_pb::GetUpdatesCallerInfo::RECONFIGURATION);
- scoped_ptr<GetUpdatesProcessor> processor(
+ std::unique_ptr<GetUpdatesProcessor> processor(
BuildGetUpdatesProcessor(configure_delegate));
EXPECT_EQ(0, GetNonAppliedHandler()->GetPassiveApplyUpdatesCount());
@@ -465,7 +465,7 @@ TEST_F(GetUpdatesProcessorApplyUpdatesTest, Configure) {
// types.
TEST_F(GetUpdatesProcessorApplyUpdatesTest, Poll) {
PollGetUpdatesDelegate poll_delegate;
- scoped_ptr<GetUpdatesProcessor> processor(
+ std::unique_ptr<GetUpdatesProcessor> processor(
BuildGetUpdatesProcessor(poll_delegate));
EXPECT_EQ(0, GetNonAppliedHandler()->GetApplyUpdatesCount());

Powered by Google App Engine
This is Rietveld 408576698