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

Unified Diff: sync/engine/get_updates_delegate.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_delegate.cc
diff --git a/sync/engine/get_updates_delegate.cc b/sync/engine/get_updates_delegate.cc
index af4ad571c5163b82abd272de6d57c292231b4ffe..8ee88b729b0ad1e0b204ba950dfc2dea3c2ec3d5 100644
--- a/sync/engine/get_updates_delegate.cc
+++ b/sync/engine/get_updates_delegate.cc
@@ -88,10 +88,10 @@ void NormalGetUpdatesDelegate::ApplyUpdates(
NonPassiveApplyUpdates(gu_types, status_controller, update_handler_map);
}
-scoped_ptr<ProtocolEvent> NormalGetUpdatesDelegate::GetNetworkRequestEvent(
+std::unique_ptr<ProtocolEvent> NormalGetUpdatesDelegate::GetNetworkRequestEvent(
base::Time timestamp,
const sync_pb::ClientToServerMessage& request) const {
- return scoped_ptr<ProtocolEvent>(
+ return std::unique_ptr<ProtocolEvent>(
new NormalGetUpdatesRequestEvent(timestamp, nudge_tracker_, request));
}
@@ -113,14 +113,12 @@ void ConfigureGetUpdatesDelegate::ApplyUpdates(
PassiveApplyUpdates(gu_types, status_controller, update_handler_map);
}
-scoped_ptr<ProtocolEvent> ConfigureGetUpdatesDelegate::GetNetworkRequestEvent(
+std::unique_ptr<ProtocolEvent>
+ConfigureGetUpdatesDelegate::GetNetworkRequestEvent(
base::Time timestamp,
const sync_pb::ClientToServerMessage& request) const {
- return scoped_ptr<ProtocolEvent>(
- new ConfigureGetUpdatesRequestEvent(
- timestamp,
- ConvertConfigureSourceToOrigin(source_),
- request));
+ return std::unique_ptr<ProtocolEvent>(new ConfigureGetUpdatesRequestEvent(
+ timestamp, ConvertConfigureSourceToOrigin(source_), request));
}
sync_pb::SyncEnums::GetUpdatesOrigin
@@ -165,10 +163,10 @@ void PollGetUpdatesDelegate::ApplyUpdates(
NonPassiveApplyUpdates(gu_types, status_controller, update_handler_map);
}
-scoped_ptr<ProtocolEvent> PollGetUpdatesDelegate::GetNetworkRequestEvent(
+std::unique_ptr<ProtocolEvent> PollGetUpdatesDelegate::GetNetworkRequestEvent(
base::Time timestamp,
const sync_pb::ClientToServerMessage& request) const {
- return scoped_ptr<ProtocolEvent>(
+ return std::unique_ptr<ProtocolEvent>(
new PollGetUpdatesRequestEvent(timestamp, request));
}

Powered by Google App Engine
This is Rietveld 408576698